CVS commit: pkgsrc/lang/clang

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Aug 13 22:39:29 UTC 2022

Modified Files:
        pkgsrc/lang/clang: Makefile PLIST

Log Message:
clang: fix more PLIST errors under non-default PKG_OPTIONs


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/lang/clang/Makefile
cvs rdiff -u -r1.35 -r1.36 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.73 pkgsrc/lang/clang/Makefile:1.74
--- pkgsrc/lang/clang/Makefile:1.73     Sat Aug 13 09:58:03 2022
+++ pkgsrc/lang/clang/Makefile  Sat Aug 13 22:39:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2022/08/13 09:58:03 tnn Exp $
+# $NetBSD: Makefile,v 1.74 2022/08/13 22:39:28 tnn Exp $
 
 .include "Makefile.common"
 
@@ -11,4 +11,10 @@ PLIST_VARS+= RISCV
 PLIST.RISCV=   yes
 .endif
 
+PLIST_VARS+=   ARM
+.if    ${PKG_BUILD_OPTIONS.llvm:Mllvm-target-arm} ||   \
+       ${PKG_BUILD_OPTIONS.llvm:Mllvm-target-aarch64}
+PLIST.ARM=     yes
+.endif
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/clang/PLIST
diff -u pkgsrc/lang/clang/PLIST:1.35 pkgsrc/lang/clang/PLIST:1.36
--- pkgsrc/lang/clang/PLIST:1.35        Fri Aug 12 19:03:39 2022
+++ pkgsrc/lang/clang/PLIST     Sat Aug 13 22:39:28 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2022/08/12 19:03:39 tnn Exp $
+@comment $NetBSD: PLIST,v 1.36 2022/08/13 22:39:28 tnn Exp $
 bin/analyze-build
 bin/c-index-test
 bin/clang
@@ -718,13 +718,13 @@ lib/clang/${PKGVERSION}/include/ammintri
 lib/clang/${PKGVERSION}/include/amxintrin.h
 lib/clang/${PKGVERSION}/include/arm64intr.h
 lib/clang/${PKGVERSION}/include/arm_acle.h
-lib/clang/${PKGVERSION}/include/arm_bf16.h
-lib/clang/${PKGVERSION}/include/arm_cde.h
+${PLIST.ARM}lib/clang/${PKGVERSION}/include/arm_bf16.h
+${PLIST.ARM}lib/clang/${PKGVERSION}/include/arm_cde.h
 lib/clang/${PKGVERSION}/include/arm_cmse.h
-lib/clang/${PKGVERSION}/include/arm_fp16.h
-lib/clang/${PKGVERSION}/include/arm_mve.h
-lib/clang/${PKGVERSION}/include/arm_neon.h
-lib/clang/${PKGVERSION}/include/arm_sve.h
+${PLIST.ARM}lib/clang/${PKGVERSION}/include/arm_fp16.h
+${PLIST.ARM}lib/clang/${PKGVERSION}/include/arm_mve.h
+${PLIST.ARM}lib/clang/${PKGVERSION}/include/arm_neon.h
+${PLIST.ARM}lib/clang/${PKGVERSION}/include/arm_sve.h
 lib/clang/${PKGVERSION}/include/armintr.h
 lib/clang/${PKGVERSION}/include/avx2intrin.h
 lib/clang/${PKGVERSION}/include/avx512bf16intrin.h