diff options
| author | nia <nia@pkgsrc.org> | 2021-09-02 11:04:02 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2021-09-02 11:04:02 +0000 |
| commit | 2f4b73bf777dada703b5c204f2ecec4e7687fc8a (patch) | |
| tree | ed4922965e95c8f8d9cf452fc3809094a628f1ba | |
| parent | 410712a674220da85cdf0cfbb5a4f1a771180397 (diff) | |
| download | pkgsrc-2f4b73bf777dada703b5c204f2ecec4e7687fc8a.tar.gz | |
firefox[68,78]: Add workarounds for NetBSD/i386
| -rw-r--r-- | www/firefox68/mozilla-common.mk | 11 | ||||
| -rw-r--r-- | www/firefox78/mozilla-common.mk | 11 |
2 files changed, 18 insertions, 4 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" diff --git a/www/firefox78/mozilla-common.mk b/www/firefox78/mozilla-common.mk index d51d11552cb..2a1de510317 100644 --- a/www/firefox78/mozilla-common.mk +++ b/www/firefox78/mozilla-common.mk @@ -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/nasm 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" |