pkgsrc-Users archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
lang/compiler-rt: fix install path
I noticed that the compiler-rt package didn't use the
LLVM_MAJOR_VERSION in the installed path, components installed to
lib/clang/16.0.6/ instead of the correct lib/clang/16/ path. I have
attached a simple patch to fix this issue.
--
kikadf
diff --git a/lang/compiler-rt/Makefile b/lang/compiler-rt/Makefile
index 323463d2c230..20c730bfc53e 100644
--- a/lang/compiler-rt/Makefile
+++ b/lang/compiler-rt/Makefile
@@ -1,5 +1,6 @@
# $NetBSD: Makefile,v 1.22 2023/10/06 19:15:20 adam Exp $
+PKGREVISION= 1
.include "../../lang/llvm/version.mk"
DISTNAME= compiler-rt-${LLVM_VERSION}.src
@@ -22,7 +23,7 @@ SSP_SUPPORTED= no
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
CMAKE_ARGS+= -DCOMPILER_RT_TEST_COMPILER=${PKG_CC:Q}
CMAKE_ARGS+= -DCOMPILER_RT_OS_DIR:STRING=${OPSYS:tl}
-CMAKE_ARGS+= -DCOMPILER_RT_INSTALL_PATH:STRING=lib/clang/${PKGVERSION_NOREV}
+CMAKE_ARGS+= -DCOMPILER_RT_INSTALL_PATH:STRING=lib/clang/${LLVM_MAJOR_VERSION}
CMAKE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
CMAKE_ARGS+= -DCOMPILER_RT_ENABLE_IOS=OFF
@@ -35,7 +36,7 @@ PYTHON_FOR_BUILD_ONLY= yes
post-install:
cd ${DESTDIR}${PREFIX} && \
- ${FIND} lib/clang/${PKGVERSION_NOREV} -type f -name '*.dylib' \
+ ${FIND} lib/clang/${LLVM_MAJOR_VERSION} -type f -name '*.dylib' \
-exec install_name_tool -id ${PREFIX}/{} {} \;
.include "../../devel/cmake/build.mk"
Home |
Main Index |
Thread Index |
Old Index