[145612] trunk/dports/devel/nodejs-devel

ciserlohn at macports.org ciserlohn at macports.org
Wed Feb 10 14:27:34 PST 2016


Revision: 145612
          https://trac.macports.org/changeset/145612
Author:   ciserlohn at macports.org
Date:     2016-02-10 14:27:33 -0800 (Wed, 10 Feb 2016)
Log Message:
-----------
nodejs-devel: update to version 5.6.0; patch gyp so that the build no longer conflicts with c-ares and v8

Modified Paths:
--------------
    trunk/dports/devel/nodejs-devel/Portfile

Added Paths:
-----------
    trunk/dports/devel/nodejs-devel/files/patch-tools-gyp-pylib-gyp-generator-make.py.diff

Modified: trunk/dports/devel/nodejs-devel/Portfile
===================================================================
--- trunk/dports/devel/nodejs-devel/Portfile	2016-02-10 22:26:55 UTC (rev 145611)
+++ trunk/dports/devel/nodejs-devel/Portfile	2016-02-10 22:27:33 UTC (rev 145612)
@@ -3,13 +3,9 @@
 
 PortSystem              1.0
 PortGroup               compiler_blacklist_versions 1.0
-PortGroup               conflicts_build 1.0
 
-# see https://github.com/nodejs/node/issues/2637
-conflicts_build         c-ares v8
-
 name                    nodejs-devel
-version                 5.5.0
+version                 5.6.0
 
 categories              devel net
 platforms               darwin
@@ -28,8 +24,8 @@
 homepage                http://nodejs.org/
 master_sites            ${homepage}dist/v${version}
 
-checksums               rmd160  d274815054bb690e6c62e724d16a81d4633d2145 \
-                        sha256  d69b18cc20699a35434858fb853997616762280610a510ec4b4ff1a94798b432
+checksums               rmd160  88e6d68d3f8575e7f394a22fc9189e745781954e \
+                        sha256  3af2cc5e5970afc83e59f2065fea2e2df846a544a100cd3c0527f0db05bec27f
 
 distname                node-v${version}
 
@@ -47,6 +43,8 @@
 
 configure.python ${prefix}/bin/python2.7
 
+patchfiles              patch-common.gypi.diff patch-tools-gyp-pylib-gyp-generator-make.py.diff
+
 post-patch {
     foreach f [concat ${worksrcpath}/configure \
                    ${worksrcpath}/tools/gyp/gyp \
@@ -100,8 +98,6 @@
 
 universal_variant       no
 
-patchfiles-append       patch-common.gypi.diff
-
 # "V8 doesn't like cache."
 configure.ccache        no
 

Added: trunk/dports/devel/nodejs-devel/files/patch-tools-gyp-pylib-gyp-generator-make.py.diff
===================================================================
--- trunk/dports/devel/nodejs-devel/files/patch-tools-gyp-pylib-gyp-generator-make.py.diff	                        (rev 0)
+++ trunk/dports/devel/nodejs-devel/files/patch-tools-gyp-pylib-gyp-generator-make.py.diff	2016-02-10 22:27:33 UTC (rev 145612)
@@ -0,0 +1,10 @@
+--- ./tools/gyp/pylib/gyp/generator/make.py	2016-01-20 19:08:27.000000000 -0600
++++ ./tools/gyp/pylib/gyp/generator/make.new.py	2016-01-22 14:34:20.000000000 -0600
+@@ -1211,6 +1211,7 @@
+       includes = config.get('include_dirs')
+       if includes:
+         includes = map(Sourceify, map(self.Absolutify, includes))
++        includes = reversed(includes)
+       self.WriteList(includes, 'INCS_%s' % configname, prefix='-I')
+ 
+     compilable = filter(Compilable, sources)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160210/47c1c057/attachment.html>


More information about the macports-changes mailing list