From f4a2b74e2c6e4e419a3d26c41b5fd6e64a711de9 Mon Sep 17 00:00:00 2001 From: Chris W <22242927+chris1786@users.noreply.github.com> Date: Wed, 27 May 2026 19:03:00 +0100 Subject: [PATCH] [llvm] Fix GCC15 build (#52008) --- ports/llvm/0007-fix-missing-includes.patch | 24 ++++++++++++++++++++++ ports/llvm/portfile.cmake | 1 + ports/llvm/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/llvm.json | 5 +++++ 5 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 ports/llvm/0007-fix-missing-includes.patch diff --git a/ports/llvm/0007-fix-missing-includes.patch b/ports/llvm/0007-fix-missing-includes.patch new file mode 100644 index 0000000000..ac7752faa9 --- /dev/null +++ b/ports/llvm/0007-fix-missing-includes.patch @@ -0,0 +1,24 @@ +diff --git a/llvm/include/llvm/ADT/SmallVector.h b/llvm/include/llvm/ADT/SmallVector.h +index 09676d792..17444147b 100644 +--- a/llvm/include/llvm/ADT/SmallVector.h ++++ b/llvm/include/llvm/ADT/SmallVector.h +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h +index 437a7bd6f..fd7d79484 100644 +--- a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h ++++ b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h +@@ -13,6 +13,7 @@ + #ifndef LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H + #define LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H + ++#include + #include + #include + diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 7764357a6d..c939f58564 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( 0004-disable-libomp-aliases.patch 0005-remove-numpy.patch 0006-create-destination-mlir-directory.patch + 0007-fix-missing-includes.patch 75711.patch # [clang] Add intrin0.h header to mimic intrin0.h used by MSVC STL for clang-cl #75711 79694.patch # [SEH] Ignore EH pad check for internal intrinsics #79694 82407.patch # [Clang][Sema] Fix incorrect rejection default construction of union with nontrivial member #82407 diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index 3c7ee6e2d5..6734db1331 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "llvm", "version": "18.1.6", - "port-version": 5, + "port-version": 6, "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "license": "Apache-2.0 WITH LLVM-exception", diff --git a/versions/baseline.json b/versions/baseline.json index bd36a5e1cf..1f91f55911 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6142,7 +6142,7 @@ }, "llvm": { "baseline": "18.1.6", - "port-version": 5 + "port-version": 6 }, "lmdb": { "baseline": "0.9.35", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index 256242ae6e..5fafb1eef0 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2b6e11b439fb46388c88f81793fb09cc3b045a0", + "version": "18.1.6", + "port-version": 6 + }, { "git-tree": "680d20d34077e7f0937b68f8f9bcd22fac6bd11e", "version": "18.1.6",