nodejs: fix Darwin build

- Add no-xcode patch back into node v5. Reverts some of
  5cb1e43fd6
- Fix patch to apply correctly
- Remove pkg-libpath patch from v4
This commit is contained in:
Stacey Touset 2016-01-29 17:51:21 -08:00
parent f272c1cbb6
commit 4356d0ccce
4 changed files with 5 additions and 27 deletions

View file

@ -1,5 +1,5 @@
diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
index c002b11..eeb0400 100644
index 407ead0..8bf64e7 100644
--- a/tools/gyp/pylib/gyp/xcode_emulation.py
+++ b/tools/gyp/pylib/gyp/xcode_emulation.py
@@ -446,10 +446,16 @@ class XcodeSettings(object):
@ -55,15 +55,3 @@ index c002b11..eeb0400 100644
is_extension = self._IsIosAppExtension() or self._IsIosWatchKitExtension()
if sdk_root and is_extension:
@@ -1032,7 +1040,10 @@ class XcodeSettings(object):
sdk_root = self._SdkPath(config_name)
if not sdk_root:
sdk_root = ''
- return l.replace('$(SDKROOT)', sdk_root)
+ if self._SdkPath():
+ return l.replace('$(SDKROOT)', sdk_root)
+ else:
+ return l
def AdjustLibraries(self, libraries, config_name=None):
"""Transforms entries like 'Cocoa.framework' in libraries into entries like

View file

@ -1,13 +0,0 @@
diff --git a/configure b/configure
index d199975..66d903b 100755
--- a/configure
+++ b/configure
@@ -734,7 +734,7 @@ def configure_library(lib, output):
# libpath needs to be provided ahead libraries
if pkg_libpath:
output['libraries'] += (
- filter(None, map(str.strip, pkg_cflags.split('-L'))))
+ pkg_libpath.split())
default_libs = getattr(options, shared_lib + '_libname')
default_libs = map('-l{0}'.format, default_libs.split(','))

View file

@ -41,7 +41,7 @@ in stdenv.mkDerivation {
sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
'';
patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./pkg-libpath.patch ];
patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
postFixup = ''
sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' $out/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py

View file

@ -38,8 +38,11 @@ in stdenv.mkDerivation {
dontDisableStatic = true;
prePatch = ''
patchShebangs .
sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
'';
patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
buildInputs = [ python which zlib libuv openssl python ]
++ optionals stdenv.isLinux [ utillinux http-parser ]
++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ];