Date: Tue, 30 Nov 2021 18:32:10 GMT From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 67d9f1559aa7 - 2021Q4 - www/firefox: make dep on wasi-compiler-rt more flexible Message-ID: <202111301832.1AUIWA2r014910@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q4 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=67d9f1559aa71f3a4e90b99387a11871d00b7d8d commit 67d9f1559aa71f3a4e90b99387a11871d00b7d8d Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> AuthorDate: 2021-11-30 18:22:07 +0000 Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org> CommitDate: 2021-11-30 18:31:41 +0000 www/firefox: make dep on wasi-compiler-rt more flexible as firefox needs matching wasi-compiler-rt, embedded llvm in rust and llvm for building and wasi-compiler-rt installs it's files in a path depending on it's full distversion, we need to know llvm/clang's full version. it's not possible to derive that programatically, as the required llvm version may not be installed at the time firefox' Makefile is being parsed. (cherry picked from commit dcc6b13daedf095da6572c27af69713ee551cb81) --- Mk/bsd.gecko.mk | 1 + www/firefox/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index a22eaf47f217..92833a7a101f 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -102,6 +102,7 @@ MOZ_EXPORT+= LLVM_OBJDUMP="${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}" # Ignore Mk/bsd.default-versions.mk but respect make.conf(5) unless LTO is enabled .if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} || ${PORT_OPTIONS:MLTO} LLVM_DEFAULT= 12 # chase bundled LLVM in lang/rust for LTO +LLVM_VERSION= 12.0.1 # keep in sync with devel/wasi-compiler-rt${LLVM_DEFAULT} .endif # Require newer Clang than what's in base system unless user opted out . if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index b93ef4ba7e27..ab6318e47579 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -27,7 +27,7 @@ BUILD_DEPENDS= nspr>=4.32:devel/nspr \ 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_DEFAULT}.0.0/lib/wasi/libclang_rt.builtins-wasm32.a:devel/wasi-compiler-rt${LLVM_DEFAULT} + ${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/clang/${LLVM_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a:devel/wasi-compiler-rt${LLVM_DEFAULT} USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111301832.1AUIWA2r014910>