From b1c98d9249c48795e0f026ccbafc82d895bc2e8d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 12 Feb 2016 20:20:19 +0100 Subject: [PATCH] icecat: unbreak musl builds for real. disable ld gold with musl for now, seems to have issues with dup symbols with hash-style=sysv. --- srcpkgs/icecat/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template index 7430a1b7530..a0af8ae1d1e 100644 --- a/srcpkgs/icecat/template +++ b/srcpkgs/icecat/template @@ -47,6 +47,7 @@ pre_configure() { [ ! -d xbps-build ] && mkdir -p xbps-build } do_configure() { + local _args if [ "$CROSS_BUILD" ]; then export HOST_CFLAGS="${XBPS_CFLAGS}" export HOST_CXXFLAGS="${XBPS_CXXFLAGS}" @@ -61,7 +62,8 @@ do_configure() { -e "s;CFLAGS=\"\$HOST_CXXFLAGS\";CFLAGS=\"${XBPS_CXXFLAGS}\";" fi case "$XBPS_TARGET_MACHINE" in - *-musl) export ac_cv_header_execinfo_h=no + *-musl) export ac_cv_header_execinfo_h=no; _args="--disable-gold";; + *) _args="--enable-gold";; esac export ac_cv_sqlite_secure_delete=yes @@ -129,8 +131,7 @@ do_configure() { --with-nss-prefix="${XBPS_CROSS_BASE}/usr" \ --with-google-api-keyfile="${wrksrc}/google-api-key" \ --enable-optimize="$CFLAGS" \ - --enable-gold=yes \ - ${cross_args} + ${_args} ${cross_args} } do_build() { cd xbps-build