tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

icecat: unbreak musl builds for real.

Browse Source 
disable ld gold with musl for now, seems to have issues with dup symbols
with hash-style=sysv.
This commit is contained in:
Juan RP 2016-02-12 20:20:19 +01:00
parent 0a3caf2907
commit b1c98d9249
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
srcpkgs/icecat/template
View File

@ -47,6 +47,7 @@ pre_configure() {
[ ! -d xbps-build ] && mkdir -p xbps-build [ ! -d xbps-build ] && mkdir -p xbps-build
} }
do_configure() { do_configure() {
local _args
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
export HOST_CFLAGS="${XBPS_CFLAGS}" export HOST_CFLAGS="${XBPS_CFLAGS}"
export HOST_CXXFLAGS="${XBPS_CXXFLAGS}" export HOST_CXXFLAGS="${XBPS_CXXFLAGS}"
@ -61,7 +62,8 @@ do_configure() {
-e "s;CFLAGS=\"\$HOST_CXXFLAGS\";CFLAGS=\"${XBPS_CXXFLAGS}\";" -e "s;CFLAGS=\"\$HOST_CXXFLAGS\";CFLAGS=\"${XBPS_CXXFLAGS}\";"
fi fi
case "$XBPS_TARGET_MACHINE" in 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 esac
export ac_cv_sqlite_secure_delete=yes export ac_cv_sqlite_secure_delete=yes
@ -129,8 +131,7 @@ do_configure() {
--with-nss-prefix="${XBPS_CROSS_BASE}/usr" \ --with-nss-prefix="${XBPS_CROSS_BASE}/usr" \
--with-google-api-keyfile="${wrksrc}/google-api-key" \ --with-google-api-keyfile="${wrksrc}/google-api-key" \
--enable-optimize="$CFLAGS" \ --enable-optimize="$CFLAGS" \
--enable-gold=yes \ ${_args} ${cross_args}
${cross_args}
} }
do_build() { do_build() {
cd xbps-build cd xbps-build