Date: Wed, 17 Jan 2024 14:33:37 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 04c35875b1f7 - main - devel/llvm14: Sanitize MANPREFIX Message-ID: <202401171433.40HEXbHW074784@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=04c35875b1f75772eed1fce99fd6119ac8c0cc7a commit 04c35875b1f75772eed1fce99fd6119ac8c0cc7a Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2024-01-17 13:53:05 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2024-01-17 14:33:17 +0000 devel/llvm14: Sanitize MANPREFIX Approved by: brooks (private mail) --- devel/llvm14/Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile index db2fc3314c19..c6bf7764f212 100644 --- a/devel/llvm14/Makefile +++ b/devel/llvm14/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 14.0.6 -PORTREVISION= 4 +PORTREVISION= 5 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} @@ -71,10 +71,6 @@ CMAKE_ARGS= -DLLVM_BUILD_LLVM_DYLIB=ON -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} -# Following commit https://github.com/kitware/cmake/commit/956054 -# we need to either change the whole man-shuffle below, or simply -# redefine CMAKE_INSTALL_MANDIR -CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH="share/man" CMAKE_ARGS+= -DLLVM_PARALLEL_LINK_JOBS=1 CMAKE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=OFF CMAKE_ARGS+= -DLLVM_ENABLE_LIBEDIT=OFF @@ -150,7 +146,7 @@ DOCS_CMAKE_ON= \ -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ -DSPHINX_WARNINGS_AS_ERRORS=OFF \ -DLLVM_BUILD_DOCS=ON -DOCS_PLIST_FILES= ${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|} +DOCS_PLIST_FILES= ${MAN1SRCS:S|^|share/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 @@ -534,7 +530,7 @@ post-install-DOCS-on: ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/doc .for _man in ${MAN1SRCS} ${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \ - ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1 + ${STAGEDIR}${MANPREFIX}/share/man/man1/${_man:R}${LLVM_SUFFIX}.1 .endfor .if ! ${PORT_OPTIONS:MLIT} ${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401171433.40HEXbHW074784>