MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 07:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

gyp: fix cflags on darwin

Browse source
This commit is contained in:
Michael Phillips 2015-06-22 18:17:02 -05:00 committed by Rok Garbas
parent 723cd518b9
commit 17898cf533
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/development/python-modules/gyp/no-darwin-cflags.patch
View file

@ -1,8 +1,8 @@
Index: gyp/pylib/gyp/xcode_emulation.py Index: gyp/pylib/gyp/xcode_emulation.py
=================================================================== ===================================================================
--- gyp/pylib/gyp/xcode_emulation.py (revision 1635) --- gyp/pylib/gyp/xcode_emulation.py
+++ gyp/pylib/gyp/xcode_emulation.py (working copy) +++ gyp/pylib/gyp/xcode_emulation.py
@@ -280,9 +280,6 @@ @@ -483,9 +483,6 @@
if self._Test('GCC_CHAR_IS_UNSIGNED_CHAR', 'YES', default='NO'): if self._Test('GCC_CHAR_IS_UNSIGNED_CHAR', 'YES', default='NO'):
cflags.append('-funsigned-char') cflags.append('-funsigned-char')
@ -12,7 +12,7 @@ Index: gyp/pylib/gyp/xcode_emulation.py
if 'GCC_DYNAMIC_NO_PIC' in self._Settings(): if 'GCC_DYNAMIC_NO_PIC' in self._Settings():
if self._Settings()['GCC_DYNAMIC_NO_PIC'] == 'YES': if self._Settings()['GCC_DYNAMIC_NO_PIC'] == 'YES':
cflags.append('-mdynamic-no-pic') cflags.append('-mdynamic-no-pic')
@@ -292,9 +289,6 @@ @@ -495,9 +492,6 @@
# mdynamic-no-pic by default for executable and possibly static lib # mdynamic-no-pic by default for executable and possibly static lib
# according to mento # according to mento
@ -22,7 +22,7 @@ Index: gyp/pylib/gyp/xcode_emulation.py
self._Appendf(cflags, 'GCC_OPTIMIZATION_LEVEL', '-O%s', default='s') self._Appendf(cflags, 'GCC_OPTIMIZATION_LEVEL', '-O%s', default='s')
if self._Test('GCC_GENERATE_DEBUGGING_SYMBOLS', 'YES', default='YES'): 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'): if self._Test('GCC_SYMBOLS_PRIVATE_EXTERN', 'YES', default='NO'):
cflags.append('-fvisibility=hidden') 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'): - if self._Test('GCC_WARN_ABOUT_MISSING_NEWLINE', 'YES', default='NO'):
- cflags.append('-Wnewline-eof') - cflags.append('-Wnewline-eof')
- -
self._AppendPlatformVersionMinFlags(cflags) # In Xcode, this is only activated when GCC_COMPILER_VERSION is clang or
# llvm-gcc. It also requires a fairly recent libtool, and
# TODO: # if the system clang isn't used, DYLD_LIBRARY_PATH needs to contain the
@@ -334,7 +322,6 @@ @@ -553,7 +541,6 @@
# TODO: Supporting fat binaries will be annoying. # TODO: Supporting fat binaries will be annoying.
self._WarnUnimplemented('ARCHS') self._WarnUnimplemented('ARCHS')
archs = ['i386'] archs = ['i386']
@ -43,7 +43,7 @@ Index: gyp/pylib/gyp/xcode_emulation.py
if archs[0] in ('i386', 'x86_64'): if archs[0] in ('i386', 'x86_64'):
if self._Test('GCC_ENABLE_SSE3_EXTENSIONS', 'YES', default='NO'): 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. # TODO: Supporting fat binaries will be annoying.
self._WarnUnimplemented('ARCHS') self._WarnUnimplemented('ARCHS')
archs = ['i386'] archs = ['i386']