CVS commit: pkgsrc/lang/clang

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Aug 12 19:03:39 UTC 2022

Modified Files:
        pkgsrc/lang/clang: Makefile PLIST

Log Message:
clang: fix PLIST error when llvm does not have llvm-target-riscv enabled


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 pkgsrc/lang/clang/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/lang/clang/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/clang/Makefile
diff -u pkgsrc/lang/clang/Makefile:1.71 pkgsrc/lang/clang/Makefile:1.72
--- pkgsrc/lang/clang/Makefile:1.71     Fri Aug 12 08:45:44 2022
+++ pkgsrc/lang/clang/Makefile  Fri Aug 12 19:03:39 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2022/08/12 08:45:44 pin Exp $
+# $NetBSD: Makefile,v 1.72 2022/08/12 19:03:39 tnn Exp $
 
 .include "Makefile.common"
 
@@ -6,4 +6,9 @@ PKGNAME=        ${DISTNAME:S/.src//}
 
 USE_TOOLS+=    perl:run
 
+PLIST_VARS+=   RISCV
+.if !empty(PKG_BUILD_OPTIONS.llvm:Mllvm-target-riscv)
+PLIST.RISCV=   yes
+.endif
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/clang/PLIST
diff -u pkgsrc/lang/clang/PLIST:1.34 pkgsrc/lang/clang/PLIST:1.35
--- pkgsrc/lang/clang/PLIST:1.34        Fri Aug 12 08:45:44 2022
+++ pkgsrc/lang/clang/PLIST     Fri Aug 12 19:03:39 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2022/08/12 08:45:44 pin Exp $
+@comment $NetBSD: PLIST,v 1.35 2022/08/12 19:03:39 tnn Exp $
 bin/analyze-build
 bin/c-index-test
 bin/clang
@@ -827,7 +827,7 @@ lib/clang/${PKGVERSION}/include/ppc_wrap
 lib/clang/${PKGVERSION}/include/prfchwintrin.h
 lib/clang/${PKGVERSION}/include/ptwriteintrin.h
 lib/clang/${PKGVERSION}/include/rdseedintrin.h
-lib/clang/${PKGVERSION}/include/riscv_vector.h
+${PLIST.RISCV}lib/clang/${PKGVERSION}/include/riscv_vector.h
 lib/clang/${PKGVERSION}/include/rtmintrin.h
 lib/clang/${PKGVERSION}/include/s390intrin.h
 lib/clang/${PKGVERSION}/include/serializeintrin.h