From 9fb3ffe131a9b8370f5ca083fd03eb63442d8f43 Mon Sep 17 00:00:00 2001 From: q66 Date: Fri, 7 Feb 2020 21:41:39 +0100 Subject: [PATCH] common: make XBPS{_TARGET}_NEED_ATOMIC less misleading --- common/xbps-src/shutils/common.sh | 6 +++--- srcpkgs/dhcp/template | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index d5373d4499..0ef64bc397 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -292,7 +292,7 @@ get_wordsize() { esac } -get_need_atomic() { +get_no_atomic8() { local arch="${1%-*}" case "$arch" in @@ -373,8 +373,8 @@ setup_pkg() { export XBPS_TARGET_LIBC=$(get_libc ${XBPS_TARGET_MACHINE}) export XBPS_WORDSIZE=$(get_wordsize ${XBPS_MACHINE}) export XBPS_TARGET_WORDSIZE=$(get_wordsize ${XBPS_TARGET_MACHINE}) - export XBPS_NEED_ATOMIC=$(get_need_atomic ${XBPS_MACHINE}) - export XBPS_TARGET_NEED_ATOMIC=$(get_need_atomic ${XBPS_TARGET_MACHINE}) + export XBPS_NO_ATOMIC8=$(get_no_atomic8 ${XBPS_MACHINE}) + export XBPS_TARGET_NO_ATOMIC8=$(get_no_atomic8 ${XBPS_TARGET_MACHINE}) export XBPS_INSTALL_XCMD XBPS_QUERY_XCMD XBPS_RECONFIGURE_XCMD \ XBPS_REMOVE_XCMD XBPS_RINDEX_XCMD XBPS_UHELPER_XCMD diff --git a/srcpkgs/dhcp/template b/srcpkgs/dhcp/template index e58deaf1fc..0af93fb9e6 100644 --- a/srcpkgs/dhcp/template +++ b/srcpkgs/dhcp/template @@ -12,7 +12,7 @@ homepage="https://www.isc.org/downloads/dhcp" distfiles="http://ftp.isc.org/isc/dhcp/${version/P/-P}/dhcp-${version/P/-P}.tar.gz" checksum=1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521 -if [ "$XBPS_TARGET_NEED_ATOMIC" ]; then +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" fi @@ -22,7 +22,7 @@ conf_files="/etc/dhcpd.conf" make_dirs="/var/lib/dhcp 0755 root root" post_patch() { - if [ "$XBPS_TARGET_NEED_ATOMIC" ]; then + if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then vsed -i "/LIBATOMIC=/s/$/-latomic/" configure.ac fi }