Date: Tue, 13 Jun 2023 18:03:29 GMT From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 002024a3a13e - 2023Q2 - devel/llvm*: Consistently use python:3.7+ Message-ID: <202306131803.35DI3TLH087774@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q2 has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=002024a3a13eff3a297b88c8fcc511fcc1d45408 commit 002024a3a13eff3a297b88c8fcc511fcc1d45408 Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2023-05-05 12:53:05 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2023-06-13 18:02:38 +0000 devel/llvm*: Consistently use python:3.7+ llvm12 was inappropriately constrained to 3.6-3.9 breaking the ability to set 3.10 as the default. llvm11 just specified "python", but there's no need to keep 2.7 support around. The rest had obsolete 3.6+ entries. No functional change: This is not expected to change the version of python used. PR: 270978 Reported by: michael.osipov@siemens.com Sponsored by: DARPA (cherry picked from commit fb323dfd2ac2499f35e4d31a24fd9dd958af619a) --- devel/llvm-cheri/Makefile | 6 +++--- devel/llvm-devel/Makefile | 6 ++++-- devel/llvm10/Makefile | 8 ++++---- devel/llvm11/Makefile | 8 ++++---- devel/llvm12/Makefile | 8 ++++---- devel/llvm13/Makefile | 8 ++++---- devel/llvm14/Makefile | 8 ++++---- devel/llvm15/Makefile | 8 ++++---- devel/llvm16/Makefile | 11 +++++------ 9 files changed, 36 insertions(+), 35 deletions(-) diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index 191739defc9c..24c083da0dbe 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -123,7 +123,7 @@ USES+= gnome .if ${PORT_OPTIONS:MLIT} MAN1SRCS+= ${LIT_MAN1SRCS} -_USES_PYTHON= python:3.6+ +_USES_PYTHON= python:3.7+ .endif .if ${PORT_OPTIONS:MLLD} @@ -135,14 +135,14 @@ COMMANDS+= ${LLD_COMMANDS} LLVM_ENABLE_PROJECTS+= lldb COMMANDS+= ${LLDB_COMMANDS} MAN1SRCS+= ${LLDB_MAN1SRCS} -_USES_PYTHON= python:3.6+ +_USES_PYTHON= python:3.7+ .endif .if defined(LLVM_ENABLE_PROJECTS) CMAKE_ARGS+= -DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}" .endif -_USES_PYTHON?= python:3.6+,build +_USES_PYTHON?= python:3.7+,build USES+= ${_USES_PYTHON} .include <bsd.port.pre.mk> diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 9f4c1c38c741..b67b890d6671 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -33,7 +33,7 @@ BUILD_DEPENDS= USES= cmake compiler:c++17-lang cpe shebangfix USE_LDCONFIG= ${LLVM_PREFIX}/lib -_USES_PYTHON?= python:build,3.6+ +_USES_PYTHON?= python:3.7+,build USES+= ${_USES_PYTHON} SHEBANG_FILES= \ clang/tools/scan-build-py/bin/analyze-build \ @@ -146,6 +146,8 @@ FLANG_IMPLIES= MLIR FLANG_PORTDOCS= flang FLANG_PLIST_DIRS= ${LLVM_DIR}/include/flang/Config LIT_DESC= Install lit and FileCheck test tools +LIT_VARS= _USES_PYTHON=python:3.7+ +LIT_PLIST_SUB= LIT_MOD_NAME=${LIT_MOD_NAME} LLD_DESC= Install lld, the LLVM linker LLDB_BUILD_DEPENDS= swig:devel/swig LLDB_DESC= Install lldb, the LLVM debugger @@ -153,7 +155,7 @@ LLDB_IMPLIES= CLANG LLDB_PLIST_SUB= PYTHON_ABIVER=${PYTHON_ABIVER} LLDB_USES= lua:53 libedit LLDB_USE= GNOME=libxml2 -LLDB_VARS= _USES_PYTHON=python:3.6+ +LLDB_VARS= _USES_PYTHON=python:3.7+ MLIR_DESC= Multi-Level Intermediate Representation OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_CMAKE_ON= -DLIBOMPTARGET_BUILD_DEVICERTL_BCLIB=OFF diff --git a/devel/llvm10/Makefile b/devel/llvm10/Makefile index c5537d2c14c9..598a8c9555e4 100644 --- a/devel/llvm10/Makefile +++ b/devel/llvm10/Makefile @@ -32,7 +32,7 @@ DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} USES= cmake compiler:c++11-lib cpe libedit perl5 tar:xz \ shebangfix -_USES_PYTHON?= python:3.6+,build +_USES_PYTHON?= python:3.7+,build USES+= ${_USES_PYTHON} USE_LDCONFIG= ${LLVM_PREFIX}/lib SHEBANG_FILES= utils/lit/lit.py utils/llvm-lit/llvm-lit.in \ @@ -133,7 +133,7 @@ GOLD_DESC= Build the LLVM Gold plugin for LTO GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils LIT_DESC= Install lit and FileCheck test tools -LIT_VARS= _USES_PYTHON=python:3.6+ +LIT_VARS= _USES_PYTHON=python:3.7+ LLD_DESC= Install lld, the LLVM linker LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} LLDB_BUILD_DEPENDS= swig:devel/swig @@ -149,13 +149,13 @@ LLDB_DISTFILES= lldb-${DISTVERSION}.src${EXTRACT_SUFX} LLDB_EXTRA_PATCHES= ${PATCHDIR}/lldb LLDB_IMPLIES= CLANG LLDB_PORTDOCS= lldb -LLDB_VARS= _USES_PYTHON=python:3.6+ +LLDB_VARS= _USES_PYTHON=python:3.7+ OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_DISTFILES= openmp-${DISTVERSION}.src${EXTRACT_SUFX} OPENMP_EXTRA_PATCHES= ${PATCHDIR}/openmp PYCLANG_DESC= Install python bindings to libclang PYCLANG_IMPLIES= CLANG -PYCLANG_VARS= _USES_PYTHON=python:3.6+ +PYCLANG_VARS= _USES_PYTHON=python:3.7+ PYCLANG_CMAKE_ON= -DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER} .if defined(WITH_DEBUG) diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile index e8653ba9472e..8226fe13990d 100644 --- a/devel/llvm11/Makefile +++ b/devel/llvm11/Makefile @@ -32,7 +32,7 @@ DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} USES= cmake compiler:c++11-lib cpe libedit perl5 tar:xz \ shebangfix -_USES_PYTHON?= python:build +_USES_PYTHON?= python:3.7+,build USES+= ${_USES_PYTHON} USE_LDCONFIG= ${LLVM_PREFIX}/lib SHEBANG_FILES= utils/lit/lit.py utils/llvm-lit/llvm-lit.in \ @@ -130,7 +130,7 @@ GOLD_DESC= Build the LLVM Gold plugin for LTO GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils LIT_DESC= Install lit and FileCheck test tools -LIT_VARS= _USES_PYTHON=python +LIT_VARS= _USES_PYTHON=python:3.7+ LLD_DESC= Install lld, the LLVM linker LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} LLDB_BUILD_DEPENDS= swig:devel/swig @@ -146,12 +146,12 @@ LLDB_DISTFILES= lldb-${DISTVERSION}.src${EXTRACT_SUFX} LLDB_EXTRA_PATCHES= ${PATCHDIR}/lldb LLDB_IMPLIES= CLANG LLDB_PORTDOCS= lldb -LLDB_VARS= _USES_PYTHON=python +LLDB_VARS= _USES_PYTHON=python:3.7+ OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_DISTFILES= openmp-${DISTVERSION}.src${EXTRACT_SUFX} PYCLANG_DESC= Install python bindings to libclang PYCLANG_IMPLIES= CLANG -PYCLANG_VARS= _USES_PYTHON=python +PYCLANG_VARS= _USES_PYTHON=python:3.7+ PYCLANG_CMAKE_ON= -DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER} .if defined(WITH_DEBUG) diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile index 7f824f56f9c4..f00daa7186a3 100644 --- a/devel/llvm12/Makefile +++ b/devel/llvm12/Makefile @@ -33,7 +33,7 @@ DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} USES= cmake compiler:c++11-lib cpe perl5 tar:xz \ shebangfix -_USES_PYTHON?= python:3.6-3.9,build +_USES_PYTHON?= python:3.7+,build USES+= ${_USES_PYTHON} USE_LDCONFIG= ${LLVM_PREFIX}/lib SHEBANG_FILES= llvm/utils/lit/lit.py llvm/utils/llvm-lit/llvm-lit.in \ @@ -143,7 +143,7 @@ GOLD_DESC= Build the LLVM Gold plugin for LTO GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils LIT_DESC= Install lit and FileCheck test tools -LIT_VARS= _USES_PYTHON=python:3.6-3.9 +LIT_VARS= _USES_PYTHON=python:3.7+ LLD_DESC= Install lld, the LLVM linker LLDB_BUILD_DEPENDS= swig:devel/swig LLDB_CMAKE_ON= -DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \ @@ -156,12 +156,12 @@ LLDB_CMAKE_ON= -DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \ LLDB_DESC= Install lldb, the LLVM debugger LLDB_IMPLIES= CLANG LLDB_USES= lua:53 libedit -LLDB_VARS= _USES_PYTHON=python:3.6-3.9 +LLDB_VARS= _USES_PYTHON=python:3.7+ OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_PORTDOCS= openmp PYCLANG_DESC= Install python bindings to libclang PYCLANG_IMPLIES= CLANG -PYCLANG_VARS= _USES_PYTHON=python:3.6-3.9 +PYCLANG_VARS= _USES_PYTHON=python:3.7+ PYCLANG_CMAKE_ON= -DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER} .if defined(WITH_DEBUG) diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile index 82e82aa8fc42..f95bdfdf3f5a 100644 --- a/devel/llvm13/Makefile +++ b/devel/llvm13/Makefile @@ -33,7 +33,7 @@ DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} USES= cmake compiler:c++11-lib cpe perl5 tar:xz \ shebangfix -_USES_PYTHON?= python:3.6+,build +_USES_PYTHON?= python:3.7+,build USES+= ${_USES_PYTHON} USE_LDCONFIG= ${LLVM_PREFIX}/lib SHEBANG_FILES= \ @@ -162,7 +162,7 @@ GOLD_DESC= Build the LLVM Gold plugin for LTO GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils LIT_DESC= Install lit and FileCheck test tools -LIT_VARS= _USES_PYTHON=python:3.6+ +LIT_VARS= _USES_PYTHON=python:3.7+ LLD_DESC= Install lld, the LLVM linker LLDB_BUILD_DEPENDS= swig:devel/swig LLDB_CMAKE_ON= -DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \ @@ -175,14 +175,14 @@ LLDB_CMAKE_ON= -DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \ LLDB_DESC= Install lldb, the LLVM debugger LLDB_IMPLIES= CLANG LLDB_USES= lua:53 libedit -LLDB_VARS= _USES_PYTHON=python:3.6+ +LLDB_VARS= _USES_PYTHON=python:3.7+ MLIR_DESC= Multi-Level Intermediate Representation OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_CMAKE_ON= -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF OPENMP_PORTDOCS= openmp PYCLANG_DESC= Install python bindings to libclang PYCLANG_IMPLIES= CLANG -PYCLANG_VARS= _USES_PYTHON=python:3.6+ +PYCLANG_VARS= _USES_PYTHON=python:3.7+ PYCLANG_CMAKE_ON= -DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER} .if defined(WITH_DEBUG) diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile index 78473f4f3e70..e91887cd81ff 100644 --- a/devel/llvm14/Makefile +++ b/devel/llvm14/Makefile @@ -33,7 +33,7 @@ DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} USES= cmake compiler:c++11-lib cpe perl5 tar:xz \ shebangfix -_USES_PYTHON?= python:3.6+,build +_USES_PYTHON?= python:3.7+,build USES+= ${_USES_PYTHON} USE_LDCONFIG= ${LLVM_PREFIX}/lib SHEBANG_FILES= \ @@ -156,7 +156,7 @@ GOLD_DESC= Build the LLVM Gold plugin for LTO GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils LIT_DESC= Install lit and FileCheck test tools -LIT_VARS= _USES_PYTHON=python:3.6+ +LIT_VARS= _USES_PYTHON=python:3.7+ LLD_DESC= Install lld, the LLVM linker LLDB_BUILD_DEPENDS= swig:devel/swig LLDB_CMAKE_ON= -DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \ @@ -170,7 +170,7 @@ LLDB_DESC= Install lldb, the LLVM debugger LLDB_IMPLIES= CLANG LLDB_PLIST_SUB= PYTHON_ABIVER=${PYTHON_ABIVER} LLDB_USES= lua:53 libedit -LLDB_VARS= _USES_PYTHON=python:3.6+ +LLDB_VARS= _USES_PYTHON=python:3.7+ MLIR_DESC= Multi-Level Intermediate Representation OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_CMAKE_ON= -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF \ @@ -178,7 +178,7 @@ OPENMP_CMAKE_ON= -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF \ OPENMP_PORTDOCS= openmp PYCLANG_DESC= Install python bindings to libclang PYCLANG_IMPLIES= CLANG -PYCLANG_VARS= _USES_PYTHON=python:3.6+ +PYCLANG_VARS= _USES_PYTHON=python:3.7+ PYCLANG_CMAKE_ON= -DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER} .if defined(WITH_DEBUG) diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile index 86dce0ee1d8a..7a5ba01e3dd9 100644 --- a/devel/llvm15/Makefile +++ b/devel/llvm15/Makefile @@ -39,7 +39,7 @@ DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} USES= cmake compiler:c++11-lib cpe perl5 tar:xz \ shebangfix -_USES_PYTHON?= python:3.6+,build +_USES_PYTHON?= python:3.7+,build USES+= ${_USES_PYTHON} USE_LDCONFIG= ${LLVM_PREFIX}/lib SHEBANG_FILES= \ @@ -175,7 +175,7 @@ GOLD_DESC= Build the LLVM Gold plugin for LTO GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils LIT_DESC= Install lit and FileCheck test tools -LIT_VARS= _USES_PYTHON=python:3.6+ +LIT_VARS= _USES_PYTHON=python:3.7+ LLD_DESC= Install lld, the LLVM linker LLDB_BUILD_DEPENDS= swig:devel/swig LLDB_CMAKE_ON= -DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \ @@ -189,14 +189,14 @@ LLDB_DESC= Install lldb, the LLVM debugger LLDB_IMPLIES= CLANG LLDB_PLIST_SUB= PYTHON_ABIVER=${PYTHON_ABIVER} LLDB_USES= lua:53 libedit -LLDB_VARS= _USES_PYTHON=python:3.6+ +LLDB_VARS= _USES_PYTHON=python:3.7+ MLIR_DESC= Multi-Level Intermediate Representation OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_CMAKE_ON= -DLIBOMPTARGET_BUILD_DEVICERTL_BCLIB=OFF OPENMP_PORTDOCS= openmp PYCLANG_DESC= Install python bindings to libclang PYCLANG_IMPLIES= CLANG -PYCLANG_VARS= _USES_PYTHON=python:3.6+ +PYCLANG_VARS= _USES_PYTHON=python:3.7+ PYCLANG_CMAKE_ON= -DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER} STATIC_LIBS_DESC= Install static libraries (does not effect sanitizers) diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index cc3ddbbea8f9..57bdeb3b7e61 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -38,9 +38,8 @@ LLVM_PREFIX= ${PREFIX}/${LLVM_DIR} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -USES= cmake compiler:c++17-lang cpe tar:xz \ - shebangfix -_USES_PYTHON?= python:3.6+,build +USES= cmake compiler:c++17-lang cpe tar:xz shebangfix +_USES_PYTHON?= python:3.7+,build USES+= ${_USES_PYTHON} USE_LDCONFIG= ${LLVM_PREFIX}/lib SHEBANG_FILES= \ @@ -175,7 +174,7 @@ GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils GOLD_PLIST_FILES= ${LLVM_DIR}/lib/LLVMgold.so LIT_DESC= Install lit and FileCheck test tools -LIT_VARS= _USES_PYTHON=python:3.6+ +LIT_VARS= _USES_PYTHON=python:3.7+ LLD_DESC= Install lld, the LLVM linker LLDB_BUILD_DEPENDS= swig:devel/swig LLDB_CMAKE_ON= -DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \ @@ -189,14 +188,14 @@ LLDB_DESC= Install lldb, the LLVM debugger LLDB_IMPLIES= CLANG LLDB_PLIST_SUB= PYTHON_ABIVER=${PYTHON_ABIVER} LLDB_USES= lua:53 libedit -LLDB_VARS= _USES_PYTHON=python:3.6+ +LLDB_VARS= _USES_PYTHON=python:3.7+ MLIR_DESC= Multi-Level Intermediate Representation OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_CMAKE_ON= -DLIBOMPTARGET_BUILD_DEVICERTL_BCLIB=OFF OPENMP_PORTDOCS= openmp PYCLANG_DESC= Install python bindings to libclang PYCLANG_IMPLIES= CLANG -PYCLANG_VARS= _USES_PYTHON=python:3.6+ +PYCLANG_VARS= _USES_PYTHON=python:3.7+ PYCLANG_CMAKE_ON= -DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER} STATIC_LIBS_DESC= Install static libraries (does not effect sanitizers)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306131803.35DI3TLH087774>