git: b21e6b4de126 - main - devel/llvm17: install all heaaders with clang

From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Tue, 11 Jun 2024 23:35:51 UTC
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b21e6b4de126e3a8053c792714456bd8dd3ceefb

commit b21e6b4de126e3a8053c792714456bd8dd3ceefb
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2024-06-11 23:25:58 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-06-11 23:26:15 +0000

    devel/llvm17: install all heaaders with clang
    
    Historically we've been unable to build FreeBSD with the full set due to
    conflicts and/or missing features between the compiler provided headers
    and FreeBSD's headers. I've verified that I can build world and kernel
    on the main, stable/14, and stable/13 branches for amd64 so let's give
    it another try in broader testing.
    
    PR:             274542
---
 devel/llvm17/Makefile                              |  2 +-
 .../files/patch-clang_lib_Headers_CMakeLists.txt   | 22 ----------------------
 devel/llvm17/pkg-plist                             |  9 +++++++++
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/devel/llvm17/Makefile b/devel/llvm17/Makefile
index c43225b7ed5d..ee08a727c5f8 100644
--- a/devel/llvm17/Makefile
+++ b/devel/llvm17/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 DISTVERSION=	17.0.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
 		https://${PRE_}releases.llvm.org/${LLVM_RELEASE}${RCDIR}/
diff --git a/devel/llvm17/files/patch-clang_lib_Headers_CMakeLists.txt b/devel/llvm17/files/patch-clang_lib_Headers_CMakeLists.txt
deleted file mode 100644
index ceb6a7de05ea..000000000000
--- a/devel/llvm17/files/patch-clang_lib_Headers_CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
---- clang/lib/Headers/CMakeLists.txt.orig
-+++ clang/lib/Headers/CMakeLists.txt
-@@ -6,19 +6,10 @@
-   float.h
-   inttypes.h
-   iso646.h
--  limits.h
-   module.modulemap
--  stdalign.h
--  stdarg.h
--  stdatomic.h
--  stdbool.h
--  stddef.h
-   __stddef_max_align_t.h
--  stdint.h
--  stdnoreturn.h
-   tgmath.h
-   unwind.h
--  varargs.h
-   )
- 
- set(arm_common_files
diff --git a/devel/llvm17/pkg-plist b/devel/llvm17/pkg-plist
index ae3607d5b8b8..a95443d62042 100644
--- a/devel/llvm17/pkg-plist
+++ b/devel/llvm17/pkg-plist
@@ -5698,6 +5698,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/iso646.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/keylockerintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/larchintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/limits.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/llvm_libc_wrappers/ctype.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/llvm_libc_wrappers/inttypes.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/llvm_libc_wrappers/stdio.h
@@ -5776,6 +5777,13 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/sm3intrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/sm4intrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/smmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/stdalign.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/stdarg.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/stdatomic.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/stdbool.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/stddef.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/stdint.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/stdnoreturn.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/tbmintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/tgmath.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/tmmintrin.h
@@ -5784,6 +5792,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/unwind.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/vadefs.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/vaesintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/varargs.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/vecintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/velintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/velintrin_approx.h