Date: Tue, 8 Feb 2022 21:02:04 +0100 From: =?UTF-8?B?VMSzbA==?= Coosemans <tijl@FreeBSD.org> To: Christoph Moench-Tegeder <cmt@FreeBSD.org> Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 51e825758420 - main - www/firefox: unbreak after b00578b9b208 Message-ID: <20220208210204.0c38d383@FreeBSD.org> In-Reply-To: <20220208210020.7a51a314@coosemans.org> References: <202202081928.218JSIaV055890@gitrepo.freebsd.org> <20220208210020.7a51a314@coosemans.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 8 Feb 2022 21:00:20 +0100 T=C4=B3l Coosemans <tijl@coosemans.org> wrote: > On Tue, 8 Feb 2022 19:28:18 GMT Christoph Moench-Tegeder > <cmt@FreeBSD.org> wrote: >> The branch main has been updated by cmt: >>=20 >> URL: https://cgit.FreeBSD.org/ports/commit/?id=3D51e8257584202f96099f31a= df71577099fbb12ce >>=20 >> commit 51e8257584202f96099f31adf71577099fbb12ce >> 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-08 19:26:13 +0000 >>=20 >> www/firefox: unbreak after b00578b9b208 >> =20 >> 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 nee= d. >> --- >> 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 +++--- >> www/firefox/Makefile | 2 +- >> 6 files changed, 10 insertions(+), 11 deletions(-) >>=20 >> 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+=3D LLVM_OBJDUMP=3D"${LOCALBASE}/bin/llvm-o= bjdump${LLVM_DEFAULT}" >> # Ignore Mk/bsd.default-versions.mk but respect make.conf(5) unless LTO= is enabled >> .if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} || ${POR= T_OPTIONS:MLTO} >> LLVM_DEFAULT=3D 13 # chase bundled LLVM in lang/rust for LTO >> -LLVM_VERSION=3D 13.0.0 # keep in sync with devel/wasi-compiler-rt${LLVM= _DEFAULT} >> +LLVM_VERSION=3D 13.0.1 # keep in sync with devel/wasi-compiler-rt${LLVM= _DEFAULT} =20 >=20 > This variable isn't defined when DEFAULT_VERSIONS contains llvm and the > LTO options is off, which then breaks the dependency checks in > www/firefox. You can simply remove this variable if you replace the > dependency in www/firefox with wasi-compiler-rt${LLVM_DEFAULT}>0:devel/wasi-compiler-rt${LLVM_DEFAULT}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20220208210204.0c38d383>