Date: Wed, 1 Dec 2021 17:33:15 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3f266e2df137 - main - www/firefox: fix build on powerpc64 Message-ID: <202112011733.1B1HXFQR053319@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f266e2df137fcd6ad7923178beec6a4ec8e1d95 commit 3f266e2df137fcd6ad7923178beec6a4ec8e1d95 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2021-12-01 17:25:27 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2021-12-01 17:25:27 +0000 www/firefox: fix build on powerpc64 WASM is not supported on big-endian. --- www/firefox/Makefile | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index ab6318e47579..daba88d04a94 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -24,10 +24,7 @@ BUILD_DEPENDS= nspr>=4.32:devel/nspr \ autoconf-2.13:devel/autoconf213 \ nasm:devel/nasm \ yasm:devel/yasm \ - zip:archivers/zip \ - ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx \ - ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \ - ${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/clang/${LLVM_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a:devel/wasi-compiler-rt${LLVM_DEFAULT} + zip:archivers/zip USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr @@ -43,11 +40,21 @@ FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png FIREFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop MOZ_OPTIONS= --enable-application=browser \ - --enable-official-branding \ - --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot + --enable-official-branding .include "${.CURDIR}/../../www/firefox/Makefile.options" +.include <bsd.port.options.mk> + +.if ${ARCH} == powerpc64 +MOZ_OPTIONS+= --without-wasm-sandboxed-libraries +.else +BUILD_DEPENDS+= ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx \ + ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \ + ${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/clang/${LLVM_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a:devel/wasi-compiler-rt${LLVM_DEFAULT} +MOZ_OPTIONS+= --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot +.endif + post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112011733.1B1HXFQR053319>