diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch new file mode 100644 index 00000000000..023cfad0123 --- /dev/null +++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch @@ -0,0 +1,14 @@ +--- node.gyp ++++ node.gyp +@@ -479,6 +479,11 @@ + 'msvs_disabled_warnings!': [4244], + + 'conditions': [ ++ [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', { ++ 'link_settings': { ++ 'libraries': [ '-latomic' ], ++ }, ++ }], + [ 'node_code_cache_path!=""', { + 'sources': [ '<(node_code_cache_path)' ] + }, { diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch index 343eff58512..4650b285c36 100644 --- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch +++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch @@ -9,20 +9,6 @@ '__x86_64__' : 'x64', '__s390__' : 's390', '__s390x__' : 's390x', ---- node.gyp -+++ node.gyp -@@ -479,6 +479,11 @@ - 'msvs_disabled_warnings!': [4244], - - 'conditions': [ -+ [ 'host_arch=="mips" or host_arch=="mipsel" or host_arch=="ppc"', { -+ 'link_settings': { -+ 'libraries': [ '-latomic' ], -+ }, -+ }], - [ 'node_code_cache_path!=""', { - 'sources': [ '<(node_code_cache_path)' ] - }, { --- deps/v8/src/libsampler/sampler.cc +++ deps/v8/src/libsampler/sampler.cc @@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) { diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template index 3944d359c67..300667cb978 100644 --- a/srcpkgs/nodejs-lts-10/template +++ b/srcpkgs/nodejs-lts-10/template @@ -1,14 +1,16 @@ # Template file for 'nodejs-lts-10' pkgname=nodejs-lts-10 version=10.24.0 -revision=1 +revision=2 wrksrc="node-v${version}" -hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel) - $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel) +# atomic8.patch will pull in -latomic even for some architectures +# not covered by XBPS_TARGET_NO_ATOMIC8. +hostmakedepends="pkg-config python which zlib-devel libatomic-devel + $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel) $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)" -makedepends="zlib-devel python-devel $(vopt_if icu icu-devel) - $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel) +makedepends="libatomic-devel zlib-devel python-devel + $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel) $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)" checkdepends="procps-ng" @@ -18,7 +20,7 @@ license="MIT" homepage="https://nodejs.org/" distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz" checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc -python_version=2 #unverified +python_version=3 build_options="ssl libuv http_parser icu nghttp2 cares" desc_option_ssl="Enable shared openssl" @@ -37,13 +39,6 @@ if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then nocross="host and target must have the same pointer size" fi -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi -if [ "$XBPS_NO_ATOMIC8" ]; then - hostmakedepends+=" libatomic-devel" -fi - CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"