summaryrefslogtreecommitdiff
path: root/www/firefox68
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2021-09-02 11:04:02 +0000
committernia <nia@pkgsrc.org>2021-09-02 11:04:02 +0000
commit2f4b73bf777dada703b5c204f2ecec4e7687fc8a (patch)
treeed4922965e95c8f8d9cf452fc3809094a628f1ba /www/firefox68
parent410712a674220da85cdf0cfbb5a4f1a771180397 (diff)
downloadpkgsrc-2f4b73bf777dada703b5c204f2ecec4e7687fc8a.tar.gz
firefox[68,78]: Add workarounds for NetBSD/i386
Diffstat (limited to 'www/firefox68')
-rw-r--r--www/firefox68/mozilla-common.mk11
1 files changed, 9 insertions, 2 deletions
diff --git a/www/firefox68/mozilla-common.mk b/www/firefox68/mozilla-common.mk
index 5d11f232189..7d3f918255a 100644
--- a/www/firefox68/mozilla-common.mk
+++ b/www/firefox68/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.18 2021/06/18 13:31:32 nia Exp $
+# $NetBSD: mozilla-common.mk,v 1.19 2021/09/02 11:04:02 nia Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -37,9 +37,16 @@ BUILD_DEPENDS+= nasm>=1.1:../../devel/nasm
BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm
.endif
-# For rustc/cargo detection
+# This is to work around build failures where an upstream configuration script
+# is confused by having more than one approximate match to MACHINE_GNU_PLATFORM
+# "i486" when attempting to select the Rust compiler target.
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
+CONFIGURE_ARGS+= --target=i586-unknown-netbsd
+CONFIGURE_ARGS+= --host=i586-unknown-netbsd
+.else
CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM}
CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM}
+.endif
CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \
-isystem${X11BASE}/include/pixman-1"