cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

www/firefox: make dep on wasi-compiler-rt more flexible

Browse Source 
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 dcc6b13dae)
This commit is contained in:
Christoph Moench-Tegeder 2021-11-30 19:22:07 +01:00
parent 0a439f39b2
commit 67d9f1559a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Mk/bsd.gecko.mk
View File

@ -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)

2
www/firefox/Makefile
View File

@ -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