CVS commit: pkgsrc/lang/compiler-rt

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Apr 11 17:02:03 UTC 2024

Modified Files:
        pkgsrc/lang/compiler-rt: Makefile

Log Message:
compiler-rt: fix install path - thanks to Robert Bagdan for spotting this; bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/lang/compiler-rt/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/compiler-rt/Makefile
diff -u pkgsrc/lang/compiler-rt/Makefile:1.22 pkgsrc/lang/compiler-rt/Makefile:1.23
--- pkgsrc/lang/compiler-rt/Makefile:1.22       Fri Oct  6 19:15:20 2023
+++ pkgsrc/lang/compiler-rt/Makefile    Thu Apr 11 17:02:03 2024
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2023/10/06 19:15:20 adam Exp $
+# $NetBSD: Makefile,v 1.23 2024/04/11 17:02:03 adam Exp $
 
 .include "../../lang/llvm/version.mk"
 
 DISTNAME=      compiler-rt-${LLVM_VERSION}.src
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S/.src//}
 CATEGORIES=    lang devel
 
@@ -13,8 +14,9 @@ LICENSE=      apache-2.0
 
 NOT_FOR_PLATFORM=      NetBSD-[0-7].*-*
 
-USE_CXX_FEATURES+=     c++14
-USE_LANGUAGES=         c99 c++
+USE_CC_FEATURES=       c99
+USE_CXX_FEATURES=      c++14
+USE_LANGUAGES=         c c++
 USE_TOOLS+=            ggrep
 GCC_REQD+=             4.8
 SSP_SUPPORTED=         no
@@ -22,7 +24,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 +37,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"