pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/seamonkey seamonkey: Fix configuring on NetBSD/i386



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0782029eeca2
branches:  trunk
changeset: 457837:0782029eeca2
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Sep 02 11:54:00 2021 +0000

description:
seamonkey: Fix configuring on NetBSD/i386

diffstat:

 www/seamonkey/mozilla-common.mk |  15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r b1e9e16bb2be -r 0782029eeca2 www/seamonkey/mozilla-common.mk
--- a/www/seamonkey/mozilla-common.mk   Thu Sep 02 11:32:13 2021 +0000
+++ b/www/seamonkey/mozilla-common.mk   Thu Sep 02 11:54:00 2021 +0000
@@ -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 @@
 #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"



Home | Main Index | Thread Index | Old Index