jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

common: make XBPS{_TARGET}_NEED_ATOMIC less misleading

Browse source
This commit is contained in:
q66 2020-02-07 21:41:39 +01:00
parent 5f60b9d3cf
commit 9fb3ffe131
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/xbps-src/shutils/common.sh
View file

@ -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

4
srcpkgs/dhcp/template
View file

@ -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
}