Page MenuHomeFreeBSD
Files F107948543

D35289.diff
No OneTemporary
Actions

D35289.diff
View Options

Index: Mk/bsd.gecko.mk
===================================================================
--- Mk/bsd.gecko.mk
+++ Mk/bsd.gecko.mk
@@ -95,10 +95,12 @@
. if !exists(/usr/bin/llvm-objdump)
MOZ_EXPORT+= LLVM_OBJDUMP="${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}"
. endif
+# Keep in sync with devel/wasi-* ports
+WASI_LLVM_DEFAULT= 14
+WASI_LLVM_VERSION= 14.0.2
# 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= 13 # chase bundled LLVM in lang/rust for LTO
-LLVM_VERSION= 13.0.1 # keep in sync with devel/wasi-compiler-rt${LLVM_DEFAULT}
+LLVM_DEFAULT= ${WASI_LLVM_DEFAULT} # chase devel/wasi-* and bundled LLVM in lang/rust for LTO
. endif
# Require newer Clang than what's in base system unless user opted out
. if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so)
Index: www/firefox/Makefile
===================================================================
--- www/firefox/Makefile
+++ www/firefox/Makefile
@@ -2,6 +2,7 @@
PORTNAME= firefox
DISTVERSION= 100.0.2
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
@@ -52,7 +53,7 @@
.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}
+ ${LOCALBASE}/llvm${WASI_LLVM_DEFAULT}/lib/clang/${WASI_LLVM_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a:devel/wasi-compiler-rt${WASI_LLVM_DEFAULT}
MOZ_OPTIONS+= --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
.endif

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 20, 8:35 PM (21 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15984106
Default Alt Text
D35289.diff (1 KB)

Event Timeline