Date: Thu, 2 Dec 2021 19:56:55 +0300 From: Dima Panov <fluffy@FreeBSD.org> To: dev-commits-ports-all@FreeBSD.org, ports-committers@FreeBSD.org, dev-commits-ports-main@FreeBSD.org, Christoph Moench-Tegeder <cmt@FreeBSD.org> Subject: Re: git: dcc6b13daedf - main - www/firefox: make dep on wasi-compiler-rt more flexible Message-ID: <cdca3f16-f288-4195-96ff-10a48ca2ec6d@Canary> In-Reply-To: <202111301826.1AUIQm0p001920@gitrepo.freebsd.org> References: <202111301826.1AUIQm0p001920@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--61a8fad7_79e2a9e3_397 Content-Type: multipart/alternative; boundary="61a8fad7_41b71efb_397" --61a8fad7_41b71efb_397 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Moin=21 Under certain condition LLVM=5FVERSION and LLVM=5FDE=46AULT will non set = anyway and stops build. LTO=3Doff, DE=46AULT=5FVERSIONS+=3Dllvm=3D<any> Not everyone loves and prefers LTO enabled :( -- Dima. (desktop, kde, x11, office, ports-secteam)=40=46reeBSD team (fluffy=40=46reeBSD.org, https://t.me/dima=5Fpanov) > On Tuesday, Nov 30, 2021 at 9:26 PM, Christoph Moench-Tegeder <cmt=40=46= reeBSD.org (mailto:cmt=40=46reeBSD.org)> wrote: > The branch main has been updated by cmt: > > URL: https://cgit.=46reeBSD.org/ports/commit/=3Fid=3Ddcc6b13daedf095da6= 572c27af69713ee551cb81 > > commit dcc6b13daedf095da6572c27af69713ee551cb81 > Author: Christoph Moench-Tegeder <cmt=40=46reeBSD.org> > AuthorDate: 2021-11-30 18:22:07 +0000 > Commit: Christoph Moench-Tegeder <cmt=40=46reeBSD.org> > CommitDate: 2021-11-30 18:22:07 +0000 > > www/firefox: make dep on wasi-compiler-rt more flexible > > as firefox needs matching wasi-compiler-rt, embedded llvm in > rust and llvm for building and wasi-compiler-rt installs it's files > in a path depending on it's full distversion, we need to know > llvm/clang's full version. it's not possible to derive that > programatically, as the required llvm version may not be installed > at the time firefox' Makefile is being parsed. > --- > Mk/bsd.gecko.mk =7C 1 + > www/firefox/Makefile =7C 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk > index b912e1aa7ade..b4500564c0ce 100644 > --- a/Mk/bsd.gecko.mk > +++ b/Mk/bsd.gecko.mk > =40=40 -95,6 +95,7 =40=40 MOZ=5FEXPORT+=3D LLVM=5FOBJDUMP=3D=22=24=7BLO= CALBASE=7D/bin/llvm-objdump=24=7BLLVM=5FDE=46AULT=7D=22 > =23 Ignore Mk/bsd.default-versions.mk but respect make.conf(5) unless L= TO is enabled > .if =21defined(DE=46AULT=5FVERSIONS) =7C=7C =21 =24=7BDE=46AULT=5FVERSI= ONS:Mllvm*=7D =7C=7C =24=7BPORT=5FOPTIONS:MLTO=7D > LLVM=5FDE=46AULT=3D 13 =23 chase bundled LLVM in lang/rust for LTO > +LLVM=5FVERSION=3D 13.0.0 =23 keep in sync with devel/wasi-compiler-rt=24= =7BLLVM=5FDE=46AULT=7D > .endif > =23 Require newer Clang than what's in base system unless user opted ou= t > . if =24=7BCC=7D =3D=3D cc && =24=7BCXX=7D =3D=3D c++ && exists(/usr/li= b/libc++.so) > diff --git a/www/firefox/Makefile b/www/firefox/Makefile > index b93ef4ba7e27..ab6318e47579 100644 > --- a/www/firefox/Makefile > +++ b/www/firefox/Makefile > =40=40 -27,7 +27,7 =40=40 BUILD=5FDEPENDS=3D nspr>=3D4.32:devel/nspr =5C= > zip:archivers/zip =5C > =24=7BLOCALBASE=7D/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel= /wasi-libcxx =5C > =24=7BLOCALBASE=7D/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi= -libc =5C > - =24=7BLOCALBASE=7D/llvm=24=7BLLVM=5FDE=46AULT=7D/lib/clang/=24=7BLLVM= =5FDE=46AULT=7D.0.0/lib/wasi/libclang=5Frt.builtins-wasm32.a:devel/wasi-c= ompiler-rt=24=7BLLVM=5FDE=46AULT=7D > + =24=7BLOCALBASE=7D/llvm=24=7BLLVM=5FDE=46AULT=7D/lib/clang/=24=7BLLVM= =5FVERSION=7D/lib/wasi/libclang=5Frt.builtins-wasm32.a:devel/wasi-compile= r-rt=24=7BLLVM=5FDE=46AULT=7D > > USE=5FGECKO=3D gecko > CON=46LICTS=5FINSTALL=3D firefox-esr --61a8fad7_41b71efb_397-- --61a8fad7_79e2a9e3_397 Content-Type: application/pgp-signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: Canary PGP V3 iQJVBAABCgA/OBxEaW1hIFBhbm92IChGcmVlQlNELk9SRyBDb21taXR0ZXIpIDxm bHVmZnlARnJlZUJTRC5PUkc+BQJhqPrXAAoJEPuLoJ3VOY8pWFkP+gJgZEXgecFr 49KIedV5Crms4JTJqjZtv2gfo1onmBLv5S145+U1e+DyzzujDuD+ZxayeLI8yr1r qsUC5CmMX6bFKezfHsrt19i7hxGDVQx/DbWuOpRyeO2KaKu1kaYRnDPCyz4/lEJc FOUSQum5uyRbI2KgjIg0eNF8FkmK9Dz8ngYnREwZhS8oRDjw/Vbppv5MxvOeB47N /BjFao/I4S+fXWwvbVFAyt6DUPt8M/8IzEhBrC/kEQTqIfU0ekOsimcQcpWjjLP5 i1SOhc05WhTA8hOB/cWNkwjcGvGGyrd6BXZMCu5Ohlg2KXpyQvgjQ73achuOkEqN /dAOKhvJ64P4CMfTe7F2ukdriLN5OHbNdAGUPDof21v10gUKLbwCxQhB4UR1ctFl odOcY0I4jF8uSZp+3cQr4jmRofagiUYwCXHyHJr8oVQV4a7HlYmHt9gPQF/LoSga An5lWLgXA21Sw93d7P8/qCh+FCdhcoLgc/H85K4hbAZbxAPwXcrYTMkojQBm/eml Ezl3ITK2cnmCBiIEMF/A4BHhKGmo8ukjAQTGBo599w0cJ10VkH7PfOTXKZ+MZs9x rTCMXrS2UjhCmHNC77d4zPJU9uk9nPGe7XDnGZDDJn+uBo1J1vM+dJkeFZka5Ehl 00qNztdfAICgtI45nldQLCkB7FNJKtsd =aGlU -----END PGP SIGNATURE----- --61a8fad7_79e2a9e3_397--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?cdca3f16-f288-4195-96ff-10a48ca2ec6d>