llvm-{cheri,morello}: don't install std*.h

As with regular llvm ports, don't install std*.h as they conflict with
FreeBSD versions.

While here, update llvm-cheri to the latest snapshot.
This commit is contained in:
Brooks Davis 2022-12-02 00:38:23 +00:00
parent 0fcc3df567
commit bae4ebdcf9
6 changed files with 39 additions and 24 deletions

View File

@ -1,6 +1,6 @@
PORTNAME= llvm
PORTVERSION= ${LLVM_MAJOR}.0.d${SNAPDATE}
PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= ${LLVM_SUFFIX}

View File

@ -4,6 +4,6 @@
#
LLVM_MAJOR= 13
LLVM_RELEASE= ${LLVM_MAJOR}.0.0
SNAPDATE= 20221104
SNAPDATE= 20221114
LLVM_COMMIT= f06202e95b8ba0ca0655ab5753f0fff070007e1f
LLVM_COMMIT= 19d402e23fcaa197e1d40547da403dc17e13c7ae

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1667845149
SHA256 (CTSRD-CHERI-llvm-project-13.0.d20221104-f06202e95b8ba0ca0655ab5753f0fff070007e1f_GH0.tar.gz) = 988867d79b5831400d10cb165f92a7c91bbd5142cbc3c455188e44517a3e39aa
SIZE (CTSRD-CHERI-llvm-project-13.0.d20221104-f06202e95b8ba0ca0655ab5753f0fff070007e1f_GH0.tar.gz) = 152264855
TIMESTAMP = 1669939197
SHA256 (CTSRD-CHERI-llvm-project-13.0.d20221114-19d402e23fcaa197e1d40547da403dc17e13c7ae_GH0.tar.gz) = 442f8ac8aa73d5f72ee7e70bf522bef669603880daca888eddc81e78660fc1f9
SIZE (CTSRD-CHERI-llvm-project-13.0.d20221114-19d402e23fcaa197e1d40547da403dc17e13c7ae_GH0.tar.gz) = 152244630

View File

@ -0,0 +1,33 @@
--- clang/lib/Headers/CMakeLists.txt.orig
+++ clang/lib/Headers/CMakeLists.txt
@@ -75,7 +75,6 @@
invpcidintrin.h
iso646.h
keylockerintrin.h
- limits.h
lwpintrin.h
lzcntintrin.h
mm3dnow.h
@@ -101,14 +100,7 @@
s390intrin.h
shaintrin.h
smmintrin.h
- stdalign.h
- stdarg.h
- stdatomic.h
- stdbool.h
- stddef.h
__stddef_max_align_t.h
- stdint.h
- stdnoreturn.h
tbmintrin.h
tgmath.h
tmmintrin.h
@@ -117,7 +109,6 @@
unwind.h
vadefs.h
vaesintrin.h
- varargs.h
vecintrin.h
vpclmulqdqintrin.h
waitpkgintrin.h

View File

@ -2663,7 +2663,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/invpcidintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/iso646.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/keylockerintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/limits.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/lwpintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/lzcntintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/mm3dnow.h
@ -2704,13 +2703,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sgxintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/shaintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/smmintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/stdalign.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/stdarg.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/stdatomic.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/stdbool.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/stddef.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/stdint.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/stdnoreturn.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/tbmintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/tgmath.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/tmmintrin.h
@ -2719,7 +2711,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/unwind.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/vadefs.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/vaesintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/varargs.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/vecintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/vpclmulqdqintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/waitpkgintrin.h

View File

@ -2665,7 +2665,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/invpcidintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/iso646.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/keylockerintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/limits.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/lwpintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/lzcntintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/mm3dnow.h
@ -2706,13 +2705,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sgxintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/shaintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/smmintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/stdalign.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/stdarg.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/stdatomic.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/stdbool.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/stddef.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/stdint.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/stdnoreturn.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/tbmintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/tgmath.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/tmmintrin.h
@ -2721,7 +2713,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/unwind.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/vadefs.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/vaesintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/varargs.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/vecintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/vpclmulqdqintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/waitpkgintrin.h