<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/63771dc76934f32144628c7eb7f752195428ef69">https://github.com/macports/macports-ports/commit/63771dc76934f32144628c7eb7f752195428ef69</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 63771dc7693 nodejs{12,14}: link against system zlib
</span>63771dc7693 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 63771dc76934f32144628c7eb7f752195428ef69
</span>Author: Victor Oliveira <rhapsodyv@gmail.com>
AuthorDate: Wed Feb 23 12:24:47 2022 -0300
<span style='display:block; white-space:pre;color:#404040;'> nodejs{12,14}: link against system zlib
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/63774 and #12996
</span>---
devel/nodejs12/Portfile | 17 +++++++++++++++--
devel/nodejs14/Portfile | 17 +++++++++++++++--
2 files changed, 30 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nodejs12/Portfile b/devel/nodejs12/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1cf0408f15b..9a613201f9d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nodejs12/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nodejs12/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ compiler.cxx_standard 2014
</span>
name nodejs12
version 12.22.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories devel net
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,8 @@ set py_ver 3.9
</span> set py_ver_nodot [string map {. {}} ${py_ver}]
depends_lib-append port:icu \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python${py_ver_nodot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${py_ver_nodot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
use_xcode yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,11 +86,23 @@ if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
</span> configure.args-append --shared-libuv
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copy zlib headers here because we do not want to prepend the entire
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ${prefix}/include to the include path (the build will then attempt to use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ICU 67 headers)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${workpath}/zlib-inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${prefix}/include/zconf.h ${prefix}/include/zlib.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/zlib-inc/
</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
configure.args-append --shared-openssl-includes=[openssl::include_dir]
configure.args-append --shared-openssl-libpath=[openssl::lib_dir]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --shared-zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --shared-zlib-includes=${workpath}/zlib-inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --shared-zlib-libpath=${prefix}/lib
</span>
# V8 only supports ARM and IA-32 processors
supported_archs i386 x86_64 arm64
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nodejs14/Portfile b/devel/nodejs14/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f9f078302ca..202c5697e74 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nodejs14/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nodejs14/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ compiler.cxx_standard 2014
</span>
name nodejs14
version 14.19.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories devel net
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,8 @@ set py_ver 3.9
</span> set py_ver_nodot [string map {. {}} ${py_ver}]
depends_lib-append port:icu \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python${py_ver_nodot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${py_ver_nodot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
use_xcode yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,11 +85,23 @@ if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
</span> configure.args-append --shared-libuv
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copy zlib headers here because we do not want to prepend the entire
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ${prefix}/include to the include path (the build will then attempt to use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ICU 67 headers)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${workpath}/zlib-inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${prefix}/include/zconf.h ${prefix}/include/zlib.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/zlib-inc/
</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
configure.args-append --shared-openssl-includes=[openssl::include_dir]
configure.args-append --shared-openssl-libpath=[openssl::lib_dir]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --shared-zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --shared-zlib-includes=${workpath}/zlib-inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --shared-zlib-libpath=${prefix}/lib
</span>
# V8 only supports ARM and IA-32 processors
supported_archs i386 x86_64 arm64
</pre><pre style='margin:0'>
</pre>