Date: Sat, 26 Mar 2022 15:30:07 +0000 From: Ashish SHUKLA <ashish@FreeBSD.ORG> To: Brooks Davis <brooks@FreeBSD.org> Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 04e074c6fd45 - main - devel/llvm14: Update to 14.0.0 release Message-ID: <20220326153007.gf3ukh5kurmiepuq@chateau.d.if> In-Reply-To: <202203252250.22PMoRbO071007@gitrepo.freebsd.org> References: <202203252250.22PMoRbO071007@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--q4c5euovel7vd5ip Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Mar 25, 2022 at 10:50:27PM +0000, Brooks Davis wrote: > The branch main has been updated by brooks: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D04e074c6fd452983ccfd931d= e0c43263d27fe1f3 >=20 > commit 04e074c6fd452983ccfd931de0c43263d27fe1f3 > Author: Brooks Davis <brooks@FreeBSD.org> > AuthorDate: 2022-03-25 22:49:58 +0000 > Commit: Brooks Davis <brooks@FreeBSD.org> > CommitDate: 2022-03-25 22:49:58 +0000 >=20 > devel/llvm14: Update to 14.0.0 release > =20 > Avoid a dependency of libunwind on sufficently recent systems where > the installed unwind.h can be found. > =20 > PR: 262707 > Reported by: pkubaj > --- > devel/llvm14/Makefile | 11 +++++++---- > devel/llvm14/distinfo | 6 +++--- > 2 files changed, 10 insertions(+), 7 deletions(-) >=20 > diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile > index 73d459cc20f6..a62a794187db 100644 > --- a/devel/llvm14/Makefile > +++ b/devel/llvm14/Makefile > @@ -1,5 +1,5 @@ > PORTNAME=3D llvm > -DISTVERSION=3D 14.0.0rc4 > +DISTVERSION=3D 14.0.0 > PORTREVISION=3D 0 > CATEGORIES=3D devel lang > MASTER_SITES=3D https://github.com/llvm/llvm-project/releases/download/l= lvmorg-${DISTVERSION:S/rc/-rc/}/ \ > @@ -134,9 +134,6 @@ CLANG_SUB_LIST=3D XCC=3Dclang${LLVM_SUFFIX} \ > X_COMPILER_TYPE=3Dclang > CLANG_USE=3D GNOME=3Dlibxml2 > COMPILER_RT_DESC=3D Sanitizer libraries > -# An unwind.h is require to build. I think an in-tree one should be used > -# but this seems to work as a workaround... > -COMPILER_RT_BUILD_DEPENDS=3D libunwind>0:devel/libunwind > COMPILER_RT_CMAKE_ON=3D -DCOMPILER_RT_INSTALL_PATH=3D${LLVM_PREFIX}/lib/= clang/${LLVM_RELEASE} > # Allow unwind.h to be found reliably > COMPILER_RT_USES=3D localbase > @@ -273,6 +270,12 @@ MLIR_PATTERN=3D ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|= /g}|mlir|libMLIR|obj.MLIRCAP > =20 > .include <bsd.port.options.mk> > =20 > +.if ${OSVERSION} < 1300525 > +# An unwind.h is require to build. I think an in-tree one should be used > +# but this seems to work as a workaround... > +COMPILER_RT_BUILD_DEPENDS=3D libunwind>0:devel/libunwind > +.endif > + This is ineffective as the evaluation/processing of `${OPTION_NAME}_BUILD_D= EPENDS` variables happen in the bsd.port.options.mk, which is already inclu= ded before this gets defined, and so it results in a build error on 13-RELE= ASE: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D /usr/local/libexec/ccache/c++ -DHAVE_RPC_XDR_H=3D0 -D__STDC_CONSTANT_MACROS= -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/wrkdirs/usr/ports/devel/ll= vm14/work/.build/projects/compiler-rt/lib/sanitizer_common -I/wrkdirs/usr/p= orts/devel/llvm14/work/llvm-project-14.0.0.src/compiler-rt/lib/sanitizer_co= mmon -I/wrkdirs/usr/ports/devel/llvm14/work/.build/include -I/wrkdirs/usr/p= orts/devel/llvm14/work/llvm-project-14.0.0.src/llvm/include -I/wrkdirs/usr/= ports/devel/llvm14/work/llvm-project-14.0.0.src/compiler-rt/lib/sanitizer_c= ommon/.. -O2 -pipe -DNDEBUG -fstack-protector-strong -isystem /usr/local/in= clude -fno-strict-aliasing -DNDEBUG -isystem /usr/local/include -fPIC -fvi= sibility-inlines-hidden -Werror=3Ddate-time -Werror=3Dunguarded-availabilit= y-new -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmis= sing-field-initializers -pedantic -Wno-long-long -Wc++98-compat-extra-semi = -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-vi= rtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion= -Wmisleading-indentation -fdiagnostics-color -ffunction-sections -fdata-se= ctions -Wall -std=3Dc++14 -Wno-unused-parameter -O2 -pipe -DNDEBUG -fstack-= protector-strong -isystem /usr/local/include -fno-strict-aliasing -DNDEBUG= -isystem /usr/local/include -m32 -fPIC -fno-builtin -fno-exceptions -fomi= t-frame-pointer -funwind-tables -fno-stack-protector -fno-sanitize=3Dsafe-s= tack -fvisibility=3Dhidden -fno-lto -Wthread-safety -Wthread-safety-referen= ce -Wthread-safety-beta -O3 -gline-tables-only -Wno-gnu -Wno-variadic-macro= s -Wno-c99-extensions -nostdinc++ -Wno-format -fno-rtti -Wframe-larger-than= =3D570 -Wglobal-constructors -std=3Dc++14 -MD -MT projects/compiler-rt/lib/= sanitizer_common/CMakeFiles/RTSanitizerCommonSymbolizer.i386.dir/sanitizer_= unwind_linux_libcdep.cpp.o -MF projects/compiler-rt/lib/sanitizer_common/CM= akeFiles/RTSanitizerCommonSymbolizer.i386.dir/sanitizer_unwind_linux_libcde= p.cpp.o.d -o projects/compiler-rt/lib/sanitizer_common/CMakeFiles/RTSanitiz= erCommonSymbolizer.i386.dir/sanitizer_unwind_linux_libcdep.cpp.o -c /wrkdir= s/usr/ports/devel/llvm14/work/llvm-project-14.0.0.src/compiler-rt/lib/sanit= izer_common/sanitizer_unwind_linux_libcdep.cpp /wrkdirs/usr/ports/devel/llvm14/work/llvm-project-14.0.0.src/compiler-rt/li= b/sanitizer_common/sanitizer_unwind_linux_libcdep.cpp:26:10: fatal error: '= unwind.h' file not found #include <unwind.h> ^~~~~~~~~~ 1 error generated. = = = =20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Following should fix this: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile index 8e3bb67aa2b8..9527e359961e 100644 --- a/devel/llvm14/Makefile +++ b/devel/llvm14/Makefile @@ -273,7 +273,9 @@ MLIR_PATTERN=3D ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}= |mlir|libMLIR|obj.MLIRCAP .if ${OSVERSION} < 1300525 # An unwind.h is require to build. I think an in-tree one should be used # but this seems to work as a workaround... -COMPILER_RT_BUILD_DEPENDS=3D libunwind>0:devel/libunwind +.if ${PORT_OPTIONS:MCOMPILER_RT} +BUILD_DEPENDS+=3D libunwind>0:devel/libunwind +.endif .endif =20 .if defined(PPC_ABI) && ${PPC_ABI} =3D=3D ELFv2 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Before diff: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # make -C devel/llvm14 -V PORT_OPTIONS BE_AMDGPU BE_STANDARD BE_WASM CLANG COMPILER_RT DOCS EXTRAS FLANG GOLD LIT= LLD LLDB MLIR OPENMP PYCLANG # make -C /usr/ports/devel/llvm14 -V BUILD_DEPENDS py38-sphinx-markdown-tables>=3D0:textproc/py-sphinx-markdown-tables@py38 p= y38-recommonmark>=3D0.0.20180530:textproc/py-recommonmark@py38 /usr/local/b= in/ld.gold:devel/binutils swig:devel/swig /usr/local/bin/cmake:devel/cmake = ninja:devel/ninja /usr/local/bin/python3.8:lang/python38 perl5>=3D5.32.r0<5= =2E33:lang/perl5.32 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D After diff: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # make -C /usr/ports/devel/llvm14 -V BUILD_DEPENDS py38-sphinx-markdown-tables>=3D0:textproc/py-sphinx-markdown-tables@py38 p= y38-recommonmark>=3D0.0.20180530:textproc/py-recommonmark@py38 /usr/local/b= in/ld.gold:devel/binutils swig:devel/swig libunwind>0:devel/libunwind /usr/= local/bin/cmake:devel/cmake ninja:devel/ninja /usr/local/bin/python3.8:lang= /python38 perl5>=3D5.32.r0<5.33:lang/perl5.32 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D HTH --=20 Ashish SHUKLA | GPG: F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0 "If I destroy you, what business is it of yours ?" (Dark Forest, Liu Cixin) --q4c5euovel7vd5ip Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEE9oLNzDncD+rhFiC2x0bPqedPpLAFAmI/MX9fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEY2 ODJDRENDMzlEQzBGRUFFMTE2MjBCNkM3NDZDRkE5RTc0RkE0QjAACgkQx0bPqedP pLBbiA//eoDyqNcUlkSd4rixSW9esyqY8/IDu8yX8YoS+6WGeASobBucG4RLsKsV 93KADU/9cYXnffOxop2k4oG6pm8CEI5U+new+23HreTShm3xoYAe8Eo+QSKVwLhC WI53BK062TJKy+LtNaBrZ7kTe/uKZtIXLxWmjQI4rx1nbw9z3gmQdCU07sDsbzBH hpPHgKtHDBtUhX3snt0V0GIqnEZjnbDcCpE4gekhVGpZ+3RoQkXhgIMBrnAsSGxv 0MSkR144gFdeB4sFNZFqrAMgxnpplLEU1iljZ2ZvNTyW6IukWEUymJ0Q8ka2bCjs JLEtN688CBr/vKaDT2OanPRqUZ6jI4oiMVJhhlNGsy4xWc/Ymaz7fNkvrU5uO5VD yugSn2IVbnef2xCQq7aTId7kC0+SH93kwOVEhOOSdy7uSq/y5m728SY9Rx502g1P H5nnbJXFdfB59nYz+eiFH8hr7NgVdZombGGvJSMpSqvtcNKpX8pI8bWzM1sStany 1S99pWGQNpj3+sH+1db8dR3an6qUgDlYSlYgkDsrQj8JjAvp9GzrvGYNs4//yx0+ eoYX5H1cqQzHtxtHjkJkEePt8q1pmeHKR64o7cyCICMpnn9Kc3Z07X7klXqsD1Gr kbluwNGEQFshjVfFLQ1KR/DLe7kPfCgV9vCLc5hRdYD2d0udKKA= =HvOU -----END PGP SIGNATURE----- --q4c5euovel7vd5ip--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20220326153007.gf3ukh5kurmiepuq>