From f2180410e7231e33f857f1cedc17c8b0ad1753fe Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 8 Jun 2020 10:49:55 +0200 Subject: [PATCH] haproxy: fix musl build --- srcpkgs/haproxy/template | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template index 85572c2ba2..e675491910 100644 --- a/srcpkgs/haproxy/template +++ b/srcpkgs/haproxy/template @@ -1,7 +1,7 @@ # Template file for 'haproxy' pkgname=haproxy version=2.1.5 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="TARGET=linux-glibc USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1" @@ -19,12 +19,16 @@ make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}" conf_files="/etc/${pkgname}/${pkgname}.cfg" system_accounts="$pkgname" -case "$XBPS_TARGET_MACHINE" in - *-musl) CFLAGS="-D__LINUX_NETFILTER_H";; +case "$XBPS_TARGET_LIBC" in + musl) + makedepends+=" libexecinfo-devel" + CFLAGS="-D__LINUX_NETFILTER_H" + ADDLIB+=" -lexecinfo" + ;; esac if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - ADDLIB="-latomic" + ADDLIB+=" -latomic" fi do_build() {