From c8fd7947feb4d246fd57d2b7d9cf5696d9ca6e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 8 Feb 2021 15:02:31 +0100 Subject: [PATCH] nodejs-lts: add libatomic-devel to {host,}makedepends Also architectures where XBPS_{TARGET_}NO_ATOMIC8 is false, e.g. armv7l-musl, are linked against libatomic, so just always add that tiny dependency to {host,}makedepends. --- srcpkgs/nodejs-lts/template | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template index 7cf73720977..c19a4b0198e 100644 --- a/srcpkgs/nodejs-lts/template +++ b/srcpkgs/nodejs-lts/template @@ -4,11 +4,11 @@ version=12.20.1 revision=1 wrksrc="node-v${version}" # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079 -hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel) - $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel) +hostmakedepends="pkg-config python libatomic-devel zlib-devel which + $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel) $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)" -makedepends="zlib-devel python-devel $(vopt_if icu icu-devel) +makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel) $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)" @@ -42,13 +42,6 @@ case "$XBPS_TARGET_MACHINE" in ppc*) broken="Node 12.x does not support 32-bit ppc" ;; esac -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"