Date: Tue, 8 Feb 2022 21:00:20 +0100 From: =?UTF-8?B?VMSzbA==?= Coosemans <tijl@coosemans.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: <20220208210020.7a51a314@coosemans.org> In-Reply-To: <202202081928.218JSIaV055890@gitrepo.freebsd.org> References: <202202081928.218JSIaV055890@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 8 Feb 2022 19:28:18 GMT Christoph Moench-Tegeder <cmt@FreeBSD.org> wrote: > The branch main has been updated by cmt: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=51e8257584202f96099f31adf71577099fbb12ce > > 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 > > 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. > --- > 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(-) > > 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} 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20220208210020.7a51a314>