From bd7ff1a7a6b867a595b0c98fefdf9c2f2ae056eb Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 27 Jan 2018 15:13:15 +0100 Subject: [PATCH] firefox: fix musl build --- srcpkgs/firefox/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 2a49b666d55..82fbee8f38b 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -11,9 +11,6 @@ checksum=0e0a39caabf94d7467d8bb4008fa9e7340a7be57b8c78ccf0cf98791a3bfaaff only_for_archs="i686 i686-musl x86_64 x86_64-musl" lib32disabled=yes -case "$XBPS_TARGET_MACHINE" in -*-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/7598/steps/shell_3/logs/stdio" ;; -esac hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm rust cargo llvm clang" @@ -33,8 +30,6 @@ build_options_default="alsa dbus pulseaudio startup_notification xscreensaver" post_extract() { case "$XBPS_TARGET_MACHINE" in *-musl) - # fix musl rust triplet - sed -i "s/\(x86_64-unknown-linux\)-gnu/\1-musl/" build/moz.configure/rust.configure cp "${FILESDIR}/stab.h" toolkit/crashreporter/google-breakpad/src/ ;; esac @@ -57,6 +52,13 @@ do_build() { ;; esac + case "$XBPS_TARGET_MACHINE" in + x86_64-musl) + echo "ac_add_options --host=x86_64-unknown-linux-musl" >>.mozconfig + echo "ac_add_options --target=x86_64-unknown-linux-musl" >>.mozconfig + ;; + esac + if [ "$CROSS_BUILD" ]; then export HOST_CFLAGS="${XBPS_CFLAGS}" export HOST_CXXFLAGS="${XBPS_CXXFLAGS}"