Date: Fri, 16 Jul 2021 18:00:43 GMT From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4512e7747f30 - main - devel/llvm1[01]: Fix lit Message-ID: <202107161800.16GI0hcW005439@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=4512e7747f3024cec4549b9d16374ed05f6759a2 commit 4512e7747f3024cec4549b9d16374ed05f6759a2 Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2021-07-16 18:00:31 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2021-07-16 18:00:31 +0000 devel/llvm1[01]: Fix lit Correct missing renames of lit modules. [0] Remove no-op LLD_LINK option. PR: 257123 [0] Reported by: Derek Schrock <dereks@lifeofadishwasher.com> --- devel/llvm10/Makefile | 10 ++++------ devel/llvm11/Makefile | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/devel/llvm10/Makefile b/devel/llvm10/Makefile index 664f1779569b..bab08c1cdedf 100644 --- a/devel/llvm10/Makefile +++ b/devel/llvm10/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 10.0.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} @@ -64,7 +64,7 @@ CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF CFLAGS+= -DNDEBUG CXXFLAGS+= -DNDEBUG -OPTIONS_DEFINE= BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLD_LINK LLDB PYCLANG +OPTIONS_DEFINE= BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLDB PYCLANG OPTIONS_DEFINE_aarch64= OPENMP OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFINE_i386= COMPILER_RT OPENMP @@ -72,7 +72,7 @@ OPTIONS_DEFINE_powerpc= GOLD OPTIONS_DEFINE_powerpc64= GOLD OPENMP OPTIONS_DEFINE_powerpc64le= GOLD OPENMP OPTIONS_DEFINE_riscv64= OPENMP -OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLD_LINK LLDB PYCLANG +OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLDB PYCLANG OPTIONS_DEFAULT_aarch64= OPENMP OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFAULT_i386= COMPILER_RT OPENMP @@ -134,8 +134,6 @@ LIT_DESC= Install lit and FileCheck test tools LIT_VARS= _USES_PYTHON=python:3.6+ LLD_DESC= Install lld, the LLVM linker LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} -LLD_LINK_DESC= Link ld.lld as ld to clang uses it -LLD_LINK_IMPLIES= LLD LLDB_BUILD_DEPENDS= swig:devel/swig LLDB_CMAKE_ON= -DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \ -DLUA_LIBRARY=${LOCALBASE}/lib/liblua-${LUA_VER}.so \ @@ -479,7 +477,7 @@ post-extract-OPENMP-on: post-patch: ${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \ -e 's|from lit|from lit${LLVM_SUFFIX}|' \ - -e 's|lit\.|lit${LLVM_SUFFIX}.|' \ + -e 's|lit\.|lit${LLVM_SUFFIX}.|g' \ ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py \ ${WRKSRC}/utils/lit/lit/formats/*.py ${REINPLACE_CMD} -e 's,/usr/local/,${LOCALBASE}/,' \ diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile index 75ba02510a25..0ec873225581 100644 --- a/devel/llvm11/Makefile +++ b/devel/llvm11/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 11.0.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} @@ -62,14 +62,14 @@ CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF CFLAGS+= -DNDEBUG CXXFLAGS+= -DNDEBUG -OPTIONS_DEFINE= BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLD_LINK LLDB PYCLANG +OPTIONS_DEFINE= BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLDB PYCLANG OPTIONS_DEFINE_aarch64= OPENMP OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFINE_i386= COMPILER_RT OPENMP OPTIONS_DEFINE_powerpc= GOLD OPTIONS_DEFINE_powerpc64= GOLD OPENMP OPTIONS_DEFINE_powerpc64le= GOLD OPENMP -OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLD_LINK LLDB PYCLANG +OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLDB PYCLANG OPTIONS_DEFAULT_aarch64= OPENMP OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFAULT_i386= COMPILER_RT OPENMP @@ -130,8 +130,6 @@ LIT_DESC= Install lit and FileCheck test tools LIT_VARS= _USES_PYTHON=python:3.6+ LLD_DESC= Install lld, the LLVM linker LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} -LLD_LINK_DESC= Link ld.lld as ld to clang uses it -LLD_LINK_IMPLIES= LLD LLDB_BUILD_DEPENDS= swig:devel/swig LLDB_CMAKE_ON= -DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \ -DLUA_LIBRARY=${LOCALBASE}/lib/liblua-${LUA_VER}.so \ @@ -473,7 +471,7 @@ post-extract-OPENMP-on: post-patch: ${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \ -e 's|from lit|from lit${LLVM_SUFFIX}|' \ - -e 's|lit\.|lit${LLVM_SUFFIX}.|' \ + -e 's|lit\.|lit${LLVM_SUFFIX}.|g' \ ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py \ ${WRKSRC}/utils/lit/lit/formats/*.py ${REINPLACE_CMD} -e 's,/usr/local/,${LOCALBASE}/,' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107161800.16GI0hcW005439>