[pkgsrc/trunk]: pkgsrc/www firefox[68,78]: Add workarounds for NetBSD/i386

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/65b84ba1089f
branches:  trunk
changeset: 457830:65b84ba1089f
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Sep 02 11:04:02 2021 +0000

description:
firefox[68,78]: Add workarounds for NetBSD/i386

diffstat:

 www/firefox68/mozilla-common.mk |  11 +++++++++--
 www/firefox78/mozilla-common.mk |  11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diffs (54 lines):

diff -r c3985d34988c -r 65b84ba1089f www/firefox68/mozilla-common.mk
--- a/www/firefox68/mozilla-common.mk   Thu Sep 02 08:32:14 2021 +0000
+++ b/www/firefox68/mozilla-common.mk   Thu Sep 02 11:04:02 2021 +0000
@@ -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+=                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"
diff -r c3985d34988c -r 65b84ba1089f www/firefox78/mozilla-common.mk
--- a/www/firefox78/mozilla-common.mk   Thu Sep 02 08:32:14 2021 +0000
+++ b/www/firefox78/mozilla-common.mk   Thu Sep 02 11:04:02 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.9 2021/01/27 05:24:11 nia Exp $
+# $NetBSD: mozilla-common.mk,v 1.10 2021/09/02 11:04:02 nia Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -35,9 +35,16 @@
 TOOL_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"