<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a29ec305aee333b1743e7deb1d128828091e7bae">https://github.com/macports/macports-ports/commit/a29ec305aee333b1743e7deb1d128828091e7bae</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a29ec305aee333b1743e7deb1d128828091e7bae
</span>Author: Andrew Udvare <audvare@gmail.com>
AuthorDate: Tue Nov 16 05:42:54 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> nodejs16: link against system zlib
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes #63774
</span><span style='display:block; white-space:pre;color:#404040;'> Revbumping because the prior version would build successfully, but the
</span><span style='display:block; white-space:pre;color:#404040;'> statically linked zlib code never worked on Monterey.
</span>---
devel/nodejs16/Portfile | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nodejs16/Portfile b/devel/nodejs16/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c040e6c1eab..11262e6942c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nodejs16/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nodejs16/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ compiler.cxx_standard 2014
</span>
name nodejs16
version 16.13.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
categories devel net
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,8 @@ set py_ver 3.9
</span> set py_ver_nodot [string map {. {}} ${py_ver}]
depends_lib-append port:python${py_ver_nodot} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
# TODO: when icu is upgraded to v68.x, use MacPorts'.
#depends_lib-append port:icu
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,12 +97,24 @@ post-patch {
</span> }
}
<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
# TODO: when icu is upgraded to v68.x, use MacPorts'.
# configure.args-append --with-intl=system-icu
configure.args-append --shared-openssl
configure.args-append --shared-openssl-includes=${prefix}/include/openssl
configure.args-append --shared-openssl-libpath=${prefix}/lib
<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>