CVS commit: pkgsrc/lang/clang

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Aug  5 23:50:20 UTC 2024

Modified Files:
        pkgsrc/lang/clang: Makefile PLIST

Log Message:
clang: restore some lost conditional PLIST entries


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 pkgsrc/lang/clang/Makefile
cvs rdiff -u -r1.40 -r1.41 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.86 pkgsrc/lang/clang/Makefile:1.87
--- pkgsrc/lang/clang/Makefile:1.86     Sat Jul  6 15:45:07 2024
+++ pkgsrc/lang/clang/Makefile  Mon Aug  5 23:50:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2024/07/06 15:45:07 adam Exp $
+# $NetBSD: Makefile,v 1.87 2024/08/05 23:50:20 tnn Exp $
 
 .include "Makefile.common"
 
@@ -6,6 +6,8 @@ PKGNAME=        ${DISTNAME:S/.src//}
 
 USE_TOOLS+=    perl:run
 
+# Certain header files are generated, and can only be generated
+# if llvm has support for the target.
 PLIST_VARS+=   RISCV
 .if ${PKG_BUILD_OPTIONS.llvm:Mllvm-target-riscv}
 PLIST.RISCV=   yes

Index: pkgsrc/lang/clang/PLIST
diff -u pkgsrc/lang/clang/PLIST:1.40 pkgsrc/lang/clang/PLIST:1.41
--- pkgsrc/lang/clang/PLIST:1.40        Sat Jul  6 15:45:07 2024
+++ pkgsrc/lang/clang/PLIST     Mon Aug  5 23:50:20 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2024/07/06 15:45:07 adam Exp $
+@comment $NetBSD: PLIST,v 1.41 2024/08/05 23:50:20 tnn Exp $
 bin/amdgpu-arch
 bin/analyze-build
 bin/c-index-test
@@ -822,16 +822,16 @@ lib/clang/${PKGVERSION_MAJOR}/include/am
 lib/clang/${PKGVERSION_MAJOR}/include/amxintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/arm64intr.h
 lib/clang/${PKGVERSION_MAJOR}/include/arm_acle.h
-lib/clang/${PKGVERSION_MAJOR}/include/arm_bf16.h
-lib/clang/${PKGVERSION_MAJOR}/include/arm_cde.h
+${PLIST.ARM}lib/clang/${PKGVERSION_MAJOR}/include/arm_bf16.h
+${PLIST.ARM}lib/clang/${PKGVERSION_MAJOR}/include/arm_cde.h
 lib/clang/${PKGVERSION_MAJOR}/include/arm_cmse.h
-lib/clang/${PKGVERSION_MAJOR}/include/arm_fp16.h
-lib/clang/${PKGVERSION_MAJOR}/include/arm_mve.h
-lib/clang/${PKGVERSION_MAJOR}/include/arm_neon.h
+${PLIST.ARM}lib/clang/${PKGVERSION_MAJOR}/include/arm_fp16.h
+${PLIST.ARM}lib/clang/${PKGVERSION_MAJOR}/include/arm_mve.h
+${PLIST.ARM}lib/clang/${PKGVERSION_MAJOR}/include/arm_neon.h
 lib/clang/${PKGVERSION_MAJOR}/include/arm_neon_sve_bridge.h
-lib/clang/${PKGVERSION_MAJOR}/include/arm_sme.h
-lib/clang/${PKGVERSION_MAJOR}/include/arm_sve.h
-lib/clang/${PKGVERSION_MAJOR}/include/arm_vector_types.h
+${PLIST.ARM}lib/clang/${PKGVERSION_MAJOR}/include/arm_sme.h
+${PLIST.ARM}lib/clang/${PKGVERSION_MAJOR}/include/arm_sve.h
+${PLIST.ARM}lib/clang/${PKGVERSION_MAJOR}/include/arm_vector_types.h
 lib/clang/${PKGVERSION_MAJOR}/include/armintr.h
 lib/clang/${PKGVERSION_MAJOR}/include/avx2intrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/avx512bf16intrin.h
@@ -965,7 +965,7 @@ lib/clang/${PKGVERSION_MAJOR}/include/rd
 lib/clang/${PKGVERSION_MAJOR}/include/riscv_bitmanip.h
 lib/clang/${PKGVERSION_MAJOR}/include/riscv_crypto.h
 lib/clang/${PKGVERSION_MAJOR}/include/riscv_ntlh.h
-lib/clang/${PKGVERSION_MAJOR}/include/riscv_vector.h
+${PLIST.RISCV}lib/clang/${PKGVERSION_MAJOR}/include/riscv_vector.h
 lib/clang/${PKGVERSION_MAJOR}/include/rtmintrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/s390intrin.h
 lib/clang/${PKGVERSION_MAJOR}/include/serializeintrin.h