Date: Sun, 2 Apr 2023 02:23:56 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: e0d79c960902 - main - devel/llvm16: style fixes Message-ID: <202304020223.3322NuOL084269@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=e0d79c960902c03bfeda04433fb677bbd86e990b commit e0d79c960902c03bfeda04433fb677bbd86e990b Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2023-04-02 02:17:49 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2023-04-02 02:17:49 +0000 devel/llvm16: style fixes Fix assorted minor issues spotted when cleaning update llvm/devel. No functional changes. --- devel/llvm16/Makefile | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index 86b18d6e5c22..9e0fa8b1343b 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -38,8 +38,7 @@ 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= cmake compiler:c++17-lang cpe tar:xz shebangfix _USES_PYTHON?= python:3.6+,build USES+= ${_USES_PYTHON} USE_LDCONFIG= ${LLVM_PREFIX}/lib @@ -70,7 +69,8 @@ SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}" CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX} CMAKE_SOURCE_PATH= ${WRKSRC}/llvm -CMAKE_ARGS= -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON +CMAKE_ARGS= -DLLVM_BUILD_LLVM_DYLIB=ON +CMAKE_ARGS+= -DLLVM_LINK_LLVM_DYLIB=ON CMAKE_ARGS+= -DLLVM_ENABLE_RTTI=ON CMAKE_ARGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=${CONFIGURE_TARGET} CMAKE_ARGS+= -DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET} @@ -165,7 +165,7 @@ DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ DOCS_PLIST_FILES= ${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|} EXTRAS_DESC= Extra clang tools EXTRAS_IMPLIES= CLANG -EXTRAS_PLIST_DIRS+= ${LLVM_DIR}/include/clang-tidy/plugin +EXTRAS_PLIST_DIRS= ${LLVM_DIR}/include/clang-tidy/plugin FLANG_DESC= Flang FORTRAN compiler FLANG_IMPLIES= MLIR FLANG_PORTDOCS= flang @@ -207,9 +207,9 @@ CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif -PLIST_SUB+= LLVM_RELEASE=${LLVM_RELEASE} \ - LLVM_SUFFIX=${LLVM_SUFFIX} \ - LLVM_MAJOR=${LLVM_MAJOR} +PLIST_SUB+= LLVM_MAJOR=${LLVM_MAJOR} \ + LLVM_RELEASE=${LLVM_RELEASE} \ + LLVM_SUFFIX=${LLVM_SUFFIX} COMMANDS= ${LLVM_COMMANDS} FIRST_COMMAND= ${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//} @@ -221,7 +221,8 @@ STRIP_LIBS= BugpointPasses.so \ ${LIBNAME}.0 \ libLTO.so -EXTRAS_LIBS= libclangApplyReplacements \ +EXTRAS_LIBS= \ + libclangApplyReplacements \ libclangChangeNamespace \ libclangDaemon \ libclangDoc \ @@ -479,10 +480,9 @@ post-patch-CLANG-on: post-patch-LLD-on: ${REINPLACE_CMD} -e "s|'indexsidebar.html'|['indexsidebar.html']|" \ - ${WRKSRC}/lld/docs/conf.py + ${WRKSRC}/lld/docs/conf.py post-install: - ${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis ${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \ ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*} @@ -522,7 +522,7 @@ post-install-DOCS-off: post-install-CLANG-on: ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \ - ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp + ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/clang-tblgen \ ${STAGEDIR}${LLVM_PREFIX}/bin/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/ @@ -531,6 +531,7 @@ post-install-CLANG-on: post-install-EXTRAS-on: ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/clang-tidy/misc/ConfusableTable + post-install-FLANG-on: ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/CodeGen/CMakeFiles ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/Dialect/CMakeFiles @@ -554,9 +555,9 @@ post-install-LIT-on: ${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/*.py \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} ${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/builtin_commands/*.py \ - ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands/ ${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/formats/*.py \ - ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats/ ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \ ${STAGEDIR}${LLVM_PREFIX}/bin/ ${LN} -fs ../${LLVM_DIR}/bin/FileCheck \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304020223.3322NuOL084269>