CVS commit: pkgsrc/www

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Sep  2 11:04:03 UTC 2021

Modified Files:
        pkgsrc/www/firefox68: mozilla-common.mk
        pkgsrc/www/firefox78: mozilla-common.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/firefox68/mozilla-common.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/firefox78/mozilla-common.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox68/mozilla-common.mk
diff -u pkgsrc/www/firefox68/mozilla-common.mk:1.18 pkgsrc/www/firefox68/mozilla-common.mk:1.19
--- pkgsrc/www/firefox68/mozilla-common.mk:1.18 Fri Jun 18 13:31:32 2021
+++ pkgsrc/www/firefox68/mozilla-common.mk      Thu Sep  2 11:04:02 2021
@@ -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/n
 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"

Index: pkgsrc/www/firefox78/mozilla-common.mk
diff -u pkgsrc/www/firefox78/mozilla-common.mk:1.9 pkgsrc/www/firefox78/mozilla-common.mk:1.10
--- pkgsrc/www/firefox78/mozilla-common.mk:1.9  Wed Jan 27 05:24:11 2021
+++ pkgsrc/www/firefox78/mozilla-common.mk      Thu Sep  2 11:04:02 2021
@@ -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+=               nasm>=2.14:../../devel/n
 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"