git: 9449a3427ca8 - 2022Q1 - www/firefox: unbreak after b00578b9b208
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 09 Feb 2022 09:22:15 UTC
The branch 2022Q1 has been updated by cmt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9449a3427ca802ffba790357af6056fb57244ef0
commit 9449a3427ca802ffba790357af6056fb57244ef0
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2022-02-08 19:26:13 +0000
Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2022-02-09 09:21:59 +0000
www/firefox: unbreak after b00578b9b208
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.
(cherry picked from commit 51e8257584202f96099f31adf71577099fbb12ce)
---
Mk/bsd.gecko.mk | 2 +-
devel/wasi-compiler-rt13/Makefile | 2 +-
devel/wasi-compiler-rt13/distinfo | 6 +++---
devel/wasi-libcxx/Makefile | 3 +--
devel/wasi-libcxx/distinfo | 6 +++---
5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 52107a1c0c4c..fdc1effe8672 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -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)
diff --git a/devel/wasi-compiler-rt13/Makefile b/devel/wasi-compiler-rt13/Makefile
index 392889bdd401..f27c8c4f8884 100644
--- a/devel/wasi-compiler-rt13/Makefile
+++ b/devel/wasi-compiler-rt13/Makefile
@@ -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}
diff --git a/devel/wasi-compiler-rt13/distinfo b/devel/wasi-compiler-rt13/distinfo
index 065a7c5d1fab..81d8f09ceaf2 100644
--- a/devel/wasi-compiler-rt13/distinfo
+++ b/devel/wasi-compiler-rt13/distinfo
@@ -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
diff --git a/devel/wasi-libcxx/Makefile b/devel/wasi-libcxx/Makefile
index eb5fe7308a65..f31bf903eace 100644
--- a/devel/wasi-libcxx/Makefile
+++ b/devel/wasi-libcxx/Makefile
@@ -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}
diff --git a/devel/wasi-libcxx/distinfo b/devel/wasi-libcxx/distinfo
index 99e281be244f..bea44b0abafa 100644
--- a/devel/wasi-libcxx/distinfo
+++ b/devel/wasi-libcxx/distinfo
@@ -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