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

www/firefox: unbreak after b00578b9b2

Browse Source 
the webasm components must follow llvm (the llvm we use for building
firefox), and wasi-compiler-rt and wasi-libcxx are really just
llvm components and should be at the same version as the llvm we need.
This commit is contained in:
Christoph Moench-Tegeder 2022-02-08 20:26:13 +01:00
parent b57860aaf7
commit 51e8257584
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mk/bsd.gecko.mk
View File

@ -98,7 +98,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= 13 # chase bundled LLVM in lang/rust for LTO
LLVM_VERSION= 13.0.0 # keep in sync with devel/wasi-compiler-rt${LLVM_DEFAULT}
LLVM_VERSION= 13.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
devel/wasi-compiler-rt13/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= compiler-rt
DISTVERSION= 13.0.0
DISTVERSION= 13.0.1
CATEGORIES= devel lang
MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}

6
devel/wasi-compiler-rt13/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1633602220
SHA256 (llvm-project-13.0.0.src.tar.xz) = 6075ad30f1ac0e15f07c1bf062c1e1268c241d674f11bd32cdf0e040c71f2bf3
SIZE (llvm-project-13.0.0.src.tar.xz) = 97577404
TIMESTAMP = 1644329424
SHA256 (llvm-project-13.0.1.src.tar.xz) = 326335a830f2e32d06d0a36393b5455d17dc73e0bd1211065227ee014f92cbf8
SIZE (llvm-project-13.0.1.src.tar.xz) = 97584928

3
devel/wasi-libcxx/Makefile
View File

@ -1,6 +1,5 @@
PORTNAME= libcxx
DISTVERSION= 13.0.0
PORTREVISION= 1
DISTVERSION= 13.0.1
CATEGORIES= devel lang
MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}

6
devel/wasi-libcxx/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1633603390
SHA256 (llvm-project-13.0.0.src.tar.xz) = 6075ad30f1ac0e15f07c1bf062c1e1268c241d674f11bd32cdf0e040c71f2bf3
SIZE (llvm-project-13.0.0.src.tar.xz) = 97577404
TIMESTAMP = 1644329406
SHA256 (llvm-project-13.0.1.src.tar.xz) = 326335a830f2e32d06d0a36393b5455d17dc73e0bd1211065227ee014f92cbf8
SIZE (llvm-project-13.0.1.src.tar.xz) = 97584928

2
www/firefox/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= firefox
DISTVERSION= 97.0
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \