svn commit: r547872 - head/Mk
Piotr Kubaj
pkubaj at FreeBSD.org
Mon Sep 7 00:58:08 UTC 2020
Author: pkubaj
Date: Mon Sep 7 00:58:07 2020
New Revision: 547872
URL: https://svnweb.freebsd.org/changeset/ports/547872
Log:
Mk/bsd.gecko.mk: fix build with defined CPUTYPE on powerpc64 (and possibly others)
In /etc/make.conf:
CPUTYPE?=power9
When trying to build www/firefox:
make: "/usr/ports/Mk/bsd.gecko.mk" line 265: Malformed conditional (${ARCH:Maarch64} || ${MACHINE_CPU:Msse2})
make: Fatal errors encountered -- cannot continuemake: "/usr/ports/Mk/bsd.gecko.mk" line 265: Malformed conditional (${ARCH:Maarch64} || ${MACHINE_CPU:Msse2})
make: "/usr/ports/Mk/bsd.port.mk" line 4517: warning: duplicate script for target "/tmp/usr/ports/www/firefox/work-make" ignored
make: "/usr/ports/Mk/bsd.port.mk" line 3423: warning: using previous script for "/tmp/usr/ports/www/firefox/work-make" defined here
make: "/usr/ports/Mk/bsd.port.mk" line 5203: warning: duplicate script for target "/tmp/usr/ports/www/firefox/work-make" ignored
make: "/usr/ports/Mk/bsd.port.mk" line 3423: warning: using previous script for "/tmp/usr/ports/www/firefox/work-make" defined here
make: "/usr/ports/Mk/bsd.port.mk" line 5364: warning: duplicate script for target "/tmp/usr/ports/www/firefox/work-make" ignored
make: "/usr/ports/Mk/bsd.port.mk" line 3423: warning: using previous script for "/tmp/usr/ports/www/firefox/work-make" defined here
make: "/usr/ports/Mk/bsd.port.mk" line 5364: warning: duplicate script for target "/tmp/usr/ports/www/firefox/work-make" ignored
make: "/usr/ports/Mk/bsd.port.mk" line 3423: warning: using previous script for "/tmp/usr/ports/www/firefox/work-make" defined here
make: "/usr/ports/Mk/bsd.port.mk" line 5364: warning: duplicate script for target "/tmp/usr/ports/www/firefox/work-make" ignored
make: "/usr/ports/Mk/bsd.port.mk" line 3423: warning: using previous script for "/tmp/usr/ports/www/firefox/work-make" defined here
make: "/usr/ports/Mk/bsd.port.mk" line 5364: warning: duplicate script for target "/tmp/usr/ports/www/firefox/work-make" ignored
make: "/usr/ports/Mk/bsd.port.mk" line 3423: warning: using previous script for "/tmp/usr/ports/www/firefox/work-make" defined here
make: "/usr/ports/Mk/bsd.port.mk" line 5364: warning: duplicate script for target "/tmp/usr/ports/www/firefox/work-make" ignored
make: "/usr/ports/Mk/bsd.port.mk" line 3423: warning: using previous script for "/tmp/usr/ports/www/firefox/work-make" defined here
make: "/usr/ports/Mk/bsd.port.mk" line 5364: warning: duplicate script for target "/tmp/usr/ports/www/firefox/work-make" ignored
make: "/usr/ports/Mk/bsd.port.mk" line 3423: warning: using previous script for "/tmp/usr/ports/www/firefox/work-make" defined here
make: "/usr/ports/Mk/bsd.port.mk" line 5364: warning: duplicate script for target "/tmp/usr/ports/www/firefox/work-make" ignored
make: "/usr/ports/Mk/bsd.port.mk" line 3423: warning: using previous script for "/tmp/usr/ports/www/firefox/work-make" defined here
make: Fatal errors encountered -- cannot continuemake: "/usr/ports/Mk/bsd.gecko.mk" line 265: Malformed conditional (${ARCH:Maarch64} || ${MACHINE_CPU:Msse2})
make: Fatal errors encountered -- cannot continuemake: "/usr/ports/Mk/bsd.gecko.mk" line 265: Malformed conditional (${ARCH:Maarch64} || ${MACHINE_CPU:Msse2})
make: Fatal errors encountered -- cannot continuemake: "/usr/ports/Mk/bsd.gecko.mk" line 265: Malformed conditional (${ARCH:Maarch64} || ${MACHINE_CPU:Msse2})
make: Fatal errors encountered -- cannot continue
PR: 248826
Approved by: gecko (maintainer timeout)
Modified:
head/Mk/bsd.gecko.mk
Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk Mon Sep 7 00:12:05 2020 (r547871)
+++ head/Mk/bsd.gecko.mk Mon Sep 7 00:58:07 2020 (r547872)
@@ -262,7 +262,7 @@ MOZ_OPTIONS+= --enable-debug --disable-release
STRIP= # ports/184285
.else
MOZ_OPTIONS+= --disable-debug --disable-debug-symbols --enable-release
-. if ${ARCH:Maarch64} || ${MACHINE_CPU:Msse2}
+. if ${ARCH:Maarch64} || (defined(MACHINE_CPU) && ${MACHINE_CPU:Msse2})
MOZ_OPTIONS+= --enable-rust-simd
. endif
.endif
More information about the svn-ports-all
mailing list