Date: Thu, 02 Dec 2021 11:26:07 +0000 From: bugzilla-noreply@freebsd.org To: gecko@FreeBSD.org Subject: [Bug 260134] www/firefox: depends on non-existing devel/wasi-compiler-rt90 Message-ID: <bug-260134-21738-WPgJP9LxZS@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-260134-21738@https.bugs.freebsd.org/bugzilla/> References: <bug-260134-21738@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D260134 --- Comment #6 from Martin Birgmeier <d8zNeCFG@aon.at> --- Thank you for the feedback. It is already nearly functional but for one thing, namely trying to repeate= dly install wasi-compiler-rt12. This seems to be due to the line ${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/clang/${LLVM_VERSION}/lib/wasi/libclan= g_rt.builtins-wasm32.a:devel/wasi-compiler-rt${LLVM_DEFAULT} in www/firefox/Makefile and the fact that LLVM_VERSION is not set: [0]# pushd /usr/ports/www/firefox /usr/ports/www/firefox ~ [0]# make -V LLVM_VERSION [0]#=20 It seems that LLVM_VERSION needs to be set properly in Mk/bsd.gecko.mk for = the case when the used llvm is not 13 (I have DEFAULT_VERSIONS+=3Dllvm=3D12 in = my /etc/make.conf). The culprit is most likely the hard-coded lines .if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} || ${PORT_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} .endif It seems that the LLVM_VERSION needs to be set for all the possible (allowe= d) different version of llvm: [0]# diff -u Mk/bsd.gecko.mk{.ORIG,} --- Mk/bsd.gecko.mk.ORIG 2021-12-01 11:14:52.636069000 +0100 +++ Mk/bsd.gecko.mk 2021-12-02 10:55:56.476151000 +0100 @@ -95,7 +95,12 @@ # 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=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} +.endif +# keep the next lines in sync with devel/wasi-compiler-rt${LLVM_DEFAULT} +.if ${LLVM_DEFAULT} =3D=3D 13 +LLVM_VERSION=3D 13.0.0 +.elif ${LLVM_DEFAULT} =3D=3D 12 +LLVM_VERSION=3D 12.0.1 .endif # Require newer Clang than what's in base system unless user opted out . if ${CC} =3D=3D cc && ${CXX} =3D=3D c++ && exists(/usr/lib/libc++.so) [1]#=20 -- Martin --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-260134-21738-WPgJP9LxZS>