about summary refs log tree commit diff
path: root/pkgs/development/python-modules/gyp
diff options
context:
space:
mode:
authorMichael Phillips <michaelalanphillips@gmail.com>2015-06-22 18:17:02 -0500
committerRok Garbas <rok@garbas.si>2015-06-24 10:17:18 +0200
commit17898cf533203035122ddc454e5bc1478762330d (patch)
tree86ae6b46e18cf9726d7f656fe88becdc442dc18d /pkgs/development/python-modules/gyp
parent723cd518b9a29be5e1c5f0015aa4a1563af830ac (diff)
downloadnixlib-17898cf533203035122ddc454e5bc1478762330d.tar
nixlib-17898cf533203035122ddc454e5bc1478762330d.tar.gz
nixlib-17898cf533203035122ddc454e5bc1478762330d.tar.bz2
nixlib-17898cf533203035122ddc454e5bc1478762330d.tar.lz
nixlib-17898cf533203035122ddc454e5bc1478762330d.tar.xz
nixlib-17898cf533203035122ddc454e5bc1478762330d.tar.zst
nixlib-17898cf533203035122ddc454e5bc1478762330d.zip
gyp: fix cflags on darwin
Diffstat (limited to 'pkgs/development/python-modules/gyp')
-rw-r--r--pkgs/development/python-modules/gyp/no-darwin-cflags.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/gyp/no-darwin-cflags.patch b/pkgs/development/python-modules/gyp/no-darwin-cflags.patch
index d81ea0d1c12a..353cc133b537 100644
--- a/pkgs/development/python-modules/gyp/no-darwin-cflags.patch
+++ b/pkgs/development/python-modules/gyp/no-darwin-cflags.patch
@@ -1,8 +1,8 @@
 Index: gyp/pylib/gyp/xcode_emulation.py
 ===================================================================
---- gyp/pylib/gyp/xcode_emulation.py	(revision 1635)
-+++ gyp/pylib/gyp/xcode_emulation.py	(working copy)
-@@ -280,9 +280,6 @@
+--- gyp/pylib/gyp/xcode_emulation.py
++++ gyp/pylib/gyp/xcode_emulation.py
+@@ -483,9 +483,6 @@
      if self._Test('GCC_CHAR_IS_UNSIGNED_CHAR', 'YES', default='NO'):
        cflags.append('-funsigned-char')
  
@@ -12,7 +12,7 @@ Index: gyp/pylib/gyp/xcode_emulation.py
      if 'GCC_DYNAMIC_NO_PIC' in self._Settings():
        if self._Settings()['GCC_DYNAMIC_NO_PIC'] == 'YES':
          cflags.append('-mdynamic-no-pic')
-@@ -292,9 +289,6 @@
+@@ -495,9 +492,6 @@
        # mdynamic-no-pic by default for executable and possibly static lib
        # according to mento
  
@@ -22,7 +22,7 @@ Index: gyp/pylib/gyp/xcode_emulation.py
      self._Appendf(cflags, 'GCC_OPTIMIZATION_LEVEL', '-O%s', default='s')
  
      if self._Test('GCC_GENERATE_DEBUGGING_SYMBOLS', 'YES', default='YES'):
-@@ -311,12 +305,6 @@
+@@ -519,12 +513,6 @@
      if self._Test('GCC_SYMBOLS_PRIVATE_EXTERN', 'YES', default='NO'):
        cflags.append('-fvisibility=hidden')
  
@@ -32,10 +32,10 @@ Index: gyp/pylib/gyp/xcode_emulation.py
 -    if self._Test('GCC_WARN_ABOUT_MISSING_NEWLINE', 'YES', default='NO'):
 -      cflags.append('-Wnewline-eof')
 -
-     self._AppendPlatformVersionMinFlags(cflags)
- 
-     # TODO:
-@@ -334,7 +322,6 @@
+     # In Xcode, this is only activated when GCC_COMPILER_VERSION is clang or
+     # llvm-gcc. It also requires a fairly recent libtool, and
+     # if the system clang isn't used, DYLD_LIBRARY_PATH needs to contain the
+@@ -553,7 +541,6 @@
        # TODO: Supporting fat binaries will be annoying.
        self._WarnUnimplemented('ARCHS')
        archs = ['i386']
@@ -43,7 +43,7 @@ Index: gyp/pylib/gyp/xcode_emulation.py
  
      if archs[0] in ('i386', 'x86_64'):
        if self._Test('GCC_ENABLE_SSE3_EXTENSIONS', 'YES', default='NO'):
-@@ -570,7 +557,6 @@
+@@ -811,7 +798,6 @@
        # TODO: Supporting fat binaries will be annoying.
        self._WarnUnimplemented('ARCHS')
        archs = ['i386']