From 8e8b629916c5b860c293ce976104ba5e6c18e9bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 28 Aug 2015 14:15:04 +0200 Subject: [PATCH] firefox-esr: fix arm*-musl This adds the same preset for CFLAGS, CXXFLAGS and LDFLAGS as for icecat (31.8.0) and fixes cross building for arm*-musl. --- srcpkgs/firefox-esr/template | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index 308ab2b12cd..43ee75e5736 100644 --- a/srcpkgs/firefox-esr/template +++ b/srcpkgs/firefox-esr/template @@ -1,7 +1,7 @@ # Template build file for 'firefox-esr'. pkgname=firefox-esr version=38.2.1 -revision=1 +revision=2 wrksrc="mozilla-esr${version%%.*}" short_desc="Lightweight gecko-based web browser" maintainer="Eivind Uggedal " @@ -22,9 +22,16 @@ makedepends="nss-devel libjpeg-turbo-devel libpng-devel depends="nss>=3.17 desktop-file-utils hicolor-icon-theme" conflicts="firefox>=0" -case "$XBPS_TARGET_MACHINE" in - armv[67]l-musl) broken="http://build.voidlinux.eu/builders/armv6l-musl_builder/builds/3641/steps/shell_3/logs/stdio";; -esac +if [ "$CROSS_BUILD" ]; then + # Make config/system_wrappers/alsa/alsalib.h and pulse/pulse.h find + # the required includes. Set system nspr and nss include paths. + CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/alsa \ + -I${XBPS_CROSS_BASE}/usr/include/pulse \ + -I${XBPS_CROSS_BASE}/usr/include/nspr \ + -I${XBPS_CROSS_BASE}/usr/include/nss" + CXXFLAGS="${CFLAGS}" + LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib" +fi pre_configure() { case "$XBPS_TARGET_MACHINE" in