From fb92ec23595400299df9511d19d55b9d467999ea Mon Sep 17 00:00:00 2001 From: q66 Date: Sat, 8 Feb 2020 17:19:40 +0100 Subject: [PATCH] monero: use generic libatomic checks --- srcpkgs/monero/template | 49 +++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template index fdcd07937c9..f580798434a 100644 --- a/srcpkgs/monero/template +++ b/srcpkgs/monero/template @@ -33,34 +33,22 @@ if [ "$CROSS_BUILD" ]; then fi case "$XBPS_TARGET_MACHINE" in - armv7*) configure_args+=" -DARCH=armv7" - ;; - armv6*) configure_args+=" -DARCH=armv6" - makedepends+=" libatomic-devel" - CFLAGS+=" -latomic" - ;; - armv5*) configure_args+=" -DARCH=armv5" - makedepends+=" libatomic-devel" - CFLAGS+=" -latomic" - ;; - aarch64*) configure_args+=" -DARCH=aarch64" - ;; - mips*) configure_args+=" -DARCH=mipsr32 -DNO_AES=ON" - makedepends+=" libatomic-devel" - CFLAGS+=" -latomic" - ;; - ppc64le*) configure_args+=" -DARCH=ppc64le" - ;; - ppc64*) configure_args+=" -DARCH=ppc64" - ;; - ppc*) configure_arch+=" -DARCH=ppc" - makedepends+=" libatomic-devel" - CFLAGS+=" -latomic" - ;; - *) configure_args+=" -DARCH=default" - ;; + armv7*) configure_args+=" -DARCH=armv7" ;; + armv6*) configure_args+=" -DARCH=armv6" ;; + armv5*) configure_args+=" -DARCH=armv5" ;; + aarch64*) configure_args+=" -DARCH=aarch64" ;; + mips*) configure_args+=" -DARCH=mipsr32 -DNO_AES=ON" ;; + ppc64le*) configure_args+=" -DARCH=ppc64le" ;; + ppc64*) configure_args+=" -DARCH=ppc64" ;; + ppc*) configure_arch+=" -DARCH=ppc" ;; + *) configure_args+=" -DARCH=default" ;; esac +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" + CFLAGS+=" -latomic" +fi + case "$XBPS_TARGET_MACHINE" in *-musl) configure_args+=" -DSTACK_TRACE=OFF" esac @@ -73,11 +61,10 @@ post_extract() { } pre_configure() { - case "$XBPS_TARGET_MACHINE" in - armv[56]*|mips*) sed -i CMakeLists.txt \ - -e '/include(version.cmake)/i list(APPEND EXTRA_LIBRARIES libatomic.a)' - ;; - esac + if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + sed -i CMakeLists.txt -e \ + '/include(version.cmake)/i list(APPEND EXTRA_LIBRARIES libatomic.a)' + fi } pre_build() {