CVS commit: pkgsrc/lang/wasi-compiler-rt

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Feb  4 12:12:12 UTC 2022

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

Log Message:
wasi-compiler-rt: install into directory matching llvm's version number

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/wasi-compiler-rt/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/wasi-compiler-rt/PLIST

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

Modified files:

Index: pkgsrc/lang/wasi-compiler-rt/Makefile
diff -u pkgsrc/lang/wasi-compiler-rt/Makefile:1.10 pkgsrc/lang/wasi-compiler-rt/Makefile:1.11
--- pkgsrc/lang/wasi-compiler-rt/Makefile:1.10  Fri Feb  4 11:01:22 2022
+++ pkgsrc/lang/wasi-compiler-rt/Makefile       Fri Feb  4 12:12:12 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2022/02/04 11:01:22 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2022/02/04 12:12:12 wiz Exp $
 
 .include "../../lang/llvm/version.mk"
 
 DISTNAME=      compiler-rt-${LLVM_VERSION}.src
 PKGNAME=       ${DISTNAME:S/.src//:S/compiler-rt-/wasi-compiler-rt-/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang devel
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -56,7 +56,7 @@ CMAKE_ARGS+=  -DCOMPILER_RT_HAS_ASM_LSE:B
 CMAKE_ARGS+=   -DCMAKE_C_COMPILER_WORKS=1 # Do not test clang compile
 CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER_WORKS=1 # Do not test clang++ compile
 
-CMAKE_INSTALL_PREFIX=  ${PREFIX}/lib/clang/13.0.0
+CMAKE_INSTALL_PREFIX=  ${PREFIX}/lib/clang/${PKGVERSION_NOREV}
 
 post-extract:
        ${MKDIR} ${WRKDIR}/build
@@ -66,7 +66,7 @@ post-extract:
 # problem in this package?
 post-install:
        ${PREFIX}/bin/llvm-ranlib \
-         ${DESTDIR}${PREFIX}/lib/clang/13.0.0/lib/wasi/libclang_rt.builtins-wasm32.a
+         ${DESTDIR}${PREFIX}/lib/clang/${PKGVERSION_NOREV}/lib/wasi/libclang_rt.builtins-wasm32.a
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/lang/wasi-compiler-rt/PLIST
diff -u pkgsrc/lang/wasi-compiler-rt/PLIST:1.1 pkgsrc/lang/wasi-compiler-rt/PLIST:1.2
--- pkgsrc/lang/wasi-compiler-rt/PLIST:1.1      Sun Dec 19 14:05:53 2021
+++ pkgsrc/lang/wasi-compiler-rt/PLIST  Fri Feb  4 12:12:12 2022
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2021/12/19 14:05:53 ryoon Exp $
-lib/clang/13.0.0/lib/wasi/libclang_rt.builtins-wasm32.a
+@comment $NetBSD: PLIST,v 1.2 2022/02/04 12:12:12 wiz Exp $
+lib/clang/${PKGVERSION}/lib/wasi/libclang_rt.builtins-wasm32.a