From b090364c857e37c54d2fd56f28ba312da5fd6834 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 9 Jun 2020 20:51:16 +0200 Subject: [PATCH] haproxy: fix build on libatomic targets --- srcpkgs/haproxy/template | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template index 47d425fc281..597b2b7d7f1 100644 --- a/srcpkgs/haproxy/template +++ b/srcpkgs/haproxy/template @@ -19,14 +19,19 @@ conf_files="/etc/${pkgname}/${pkgname}.cfg" system_accounts="$pkgname" do_build() { - local TARGET - case "$XBPS_TARGET_LIBC" in - musl) TARGET=linux-musl ;; - *) TARGET=linux-glibc ;; - esac + local target atomic + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + target=linux-musl + else + target=linux-glibc + fi + if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + atomic="-latomic" + fi make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \ - TARGET=$TARGET USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \ - USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 + TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \ + USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \ + ADDLIB="$atomic" } do_check() {