<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/885e9674b88647ab441c6bfb71e28a45549e1fcf">https://github.com/macports/macports-ports/commit/885e9674b88647ab441c6bfb71e28a45549e1fcf</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 885e967 nodejs6: fix build on older systems
</span>885e967 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 885e9674b88647ab441c6bfb71e28a45549e1fcf
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sun Apr 21 19:02:08 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> nodejs6: fix build on older systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> allows build on < 10.7
</span>---
devel/nodejs6/Portfile | 18 +++++++++++-------
devel/nodejs6/files/patch-nodejs6-old-tr1-calls.diff | 19 +++++++++++++++++++
2 files changed, 30 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nodejs6/Portfile b/devel/nodejs6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c2b0c35..fdcc0fd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nodejs6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nodejs6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,6 +49,11 @@ configure.python ${prefix}/bin/python2.7
</span> patchfiles patch-common.gypi.diff \
patch-tools-gyp-pylib-gyp-generator-make.py.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${configure.cxx_stdlib} eq "libc++" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libc++ headers don't put this in <tr1/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-nodejs6-old-tr1-calls.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
foreach f [concat ${worksrcpath}/configure \
${worksrcpath}/tools/gyp/gyp \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +70,12 @@ post-patch {
</span> reinplace "s|/usr/bin/env node|${prefix}/bin/node|" ${worksrcpath}/tools/doc/node_modules/marked/bin/marked
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# We'll use the system libuv instead, as it is fixed for older systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/libuv.dylib:libuv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --shared-libuv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append --without-npm
configure.args-append --with-intl=system-icu
configure.args-append --shared-openssl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,13 +216,6 @@ destroot {
</span> ${docdir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} ${version} requires Mac OS X 10.7 or greater."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible Mac OS X version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.url ${homepage}dist/
livecheck.type regex
livecheck.regex {v(6\.\d+\.\d+)}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nodejs6/files/patch-nodejs6-old-tr1-calls.diff b/devel/nodejs6/files/patch-nodejs6-old-tr1-calls.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..aa18ca0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nodejs6/files/patch-nodejs6-old-tr1-calls.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/util.h.orig 2019-04-21 18:08:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/util.h 2019-04-21 18:10:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,16 +12,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// OSX 10.9 defaults to libc++ which provides a C++11 <type_traits> header.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1090
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define USE_TR1_TYPE_TRAITS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef USE_TR1_TYPE_TRAITS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <tr1/type_traits> // NOLINT(build/c++tr1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <type_traits> // std::remove_reference
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace node {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>