From e57bfa8f94cfc36f399285b2c24db56fea18ea77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 29 Jun 2018 07:42:52 +0200 Subject: [PATCH] haproxy: use ADDLIB for armv[56]*|mips* -latomic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/haproxy/template | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template index e3acda01b06..f9e727e3b03 100644 --- a/srcpkgs/haproxy/template +++ b/srcpkgs/haproxy/template @@ -22,16 +22,13 @@ case "$XBPS_TARGET_MACHINE" in *-musl) CFLAGS="-D__LINUX_NETFILTER_H";; esac case "$XBPS_TARGET_MACHINE" in - armv[56]*|mips*) makedepends+=" libatomic-devel";; + armv[56]*|mips*) ADDLIB="-latomic"; makedepends+=" libatomic-devel";; esac do_build() { - case "$XBPS_TARGET_MACHINE" in - armv[56]*|mips*) sed -i Makefile -e's;$(LDOPTS);& -latomic;' ;; - esac make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \ - ${make_build_args} + ADDLIB="${ADDLIB}" ${make_build_args} } post_install() {