summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2021-09-02 11:54:00 +0000
committernia <nia@pkgsrc.org>2021-09-02 11:54:00 +0000
commit4da9875934922bc633e3f9ca33ef5b4c7e8956b9 (patch)
tree5fa93b690e4cb9e853b5c6f712d7f1bb76a0efc9
parente5537b53e7e51795bdf26ba8ec7527a7496d78f4 (diff)
downloadpkgsrc-4da9875934922bc633e3f9ca33ef5b4c7e8956b9.tar.gz
seamonkey: Fix configuring on NetBSD/i386
-rw-r--r--www/seamonkey/mozilla-common.mk15
1 files changed, 11 insertions, 4 deletions
diff --git a/www/seamonkey/mozilla-common.mk b/www/seamonkey/mozilla-common.mk
index 5c461e1ada3..f441f2ab477 100644
--- a/www/seamonkey/mozilla-common.mk
+++ b/www/seamonkey/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.8 2021/02/08 12:26:20 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.9 2021/09/02 11:54:00 nia Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -35,9 +35,16 @@ BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm
#CONFIGURE_ARGS+= --enable-eme=widevine
.endif
-# For rustc/cargo detection
-CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM:Q}
-CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q}
+# 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"