git: a5aad1306ad1 - main - devel/llvm-devel: Sanitize MANPREFIX
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 17 Jan 2024 14:33:33 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a5aad1306ad10c440d7b6a49c1508054194e7269
commit a5aad1306ad10c440d7b6a49c1508054194e7269
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-01-17 11:24:35 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-01-17 14:33:14 +0000
devel/llvm-devel: Sanitize MANPREFIX
Approved by: brooks (private mail)
---
devel/llvm-devel/Makefile | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index c7b37fcc18d0..5228dbd1b20e 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME= llvm
PORTVERSION= ${LLVM_MAJOR}.0.d${SNAPDATE}
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= ${LLVM_SUFFIX}
@@ -67,10 +67,6 @@ CMAKE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=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_LIBXML2=OFF
@@ -143,7 +139,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
@@ -400,7 +396,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