pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

llvm: fix patch relative to WRKSRC issue



Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Tue Nov 3 12:00:19 2026 +0100
Changeset:	e4c5470a142f3d6f3c7fe1b52edeb9522b05aff7

Modified Files:
	llvm/distinfo
Added Files:
	llvm/patches/patch-include_llvm_Support_Allocator.h
Removed Files:
	llvm/patches/patch-llvm_include_llvm_Support_Allocator.h

Log Message:
llvm: fix patch relative to WRKSRC issue

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e4c5470a142f3d6f3c7fe1b52edeb9522b05aff7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 llvm/distinfo                                            |  2 +-
 llvm/patches/patch-include_llvm_Support_Allocator.h      | 16 ++++++++++++++++
 llvm/patches/patch-llvm_include_llvm_Support_Allocator.h | 16 ----------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diffs:
diff --git a/llvm/distinfo b/llvm/distinfo
index a31d00bd7f..0e5039398c 100644
--- a/llvm/distinfo
+++ b/llvm/distinfo
@@ -7,6 +7,6 @@ SHA1 (patch-CMakeLists.txt) = e7ed5046d2f6f2f6338bc842e83666ed109bd2b0
 SHA1 (patch-cmake_config-ix.cmake) = f3167fbdd0ca3fea9f9e5516760b072af62d121a
 SHA1 (patch-cmake_modules_AddLLVM.cmake) = 036eec53f8a2c5921235341db1bf2f504dca8fea
 SHA1 (patch-include_llvm-c_DataTypes.h) = ff547cae5bdf90c5a1371b9eb196e7537a03b18d
-SHA1 (patch-llvm_include_llvm_Support_Allocator.h) = 27432fc3a4d08698438ab42ae52378f0451ff766
+SHA1 (patch-include_llvm_Support_Allocator.h) = 57490e99bf85da6c75b76da45fcbdc68e7334374
 SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 92558f2d7d87b7a26f7f3a2b3b3dc539ae13e672
 SHA1 (patch-utils_llvm-lit_CMakeLists.txt) = e6f223e68b8ef03175282af1afbfcd7e0b30c6ca
diff --git a/llvm/patches/patch-include_llvm_Support_Allocator.h b/llvm/patches/patch-include_llvm_Support_Allocator.h
new file mode 100644
index 0000000000..bb94987ab2
--- /dev/null
+++ b/llvm/patches/patch-include_llvm_Support_Allocator.h
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Apply fix from upstream LLVM for
+  https://github.com/llvm/llvm-project/issues/230782
+
+--- include/llvm/Support/Allocator.h.orig	2026-10-25 16:06:49.517322603 +0000
++++ include/llvm/Support/Allocator.h
+@@ -64,7 +64,7 @@ LLVM_ABI void printBumpPtrAllocatorStats
+ /// CurPtr when the requested alignment is no greater than MinAlign.
+ template <typename AllocatorT = MallocAllocator, size_t SlabSize = 4096,
+           size_t SizeThreshold = SlabSize, size_t GrowthDelay = 128,
+-          size_t MinAlign = 8>
++          size_t MinAlign = std::min<size_t>(8, alignof(std::max_align_t))>
+ class BumpPtrAllocatorImpl
+     : public AllocatorBase<BumpPtrAllocatorImpl<
+           AllocatorT, SlabSize, SizeThreshold, GrowthDelay, MinAlign>>,
diff --git a/llvm/patches/patch-llvm_include_llvm_Support_Allocator.h b/llvm/patches/patch-llvm_include_llvm_Support_Allocator.h
deleted file mode 100644
index f9c9f255d9..0000000000
--- a/llvm/patches/patch-llvm_include_llvm_Support_Allocator.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Apply fix from upstream LLVM for
-  https://github.com/llvm/llvm-project/issues/230782
-
---- llvm/include/llvm/Support/Allocator.h.orig	2026-10-25 16:06:49.517322603 +0000
-+++ llvm/include/llvm/Support/Allocator.h
-@@ -64,7 +64,7 @@ LLVM_ABI void printBumpPtrAllocatorStats
- /// CurPtr when the requested alignment is no greater than MinAlign.
- template <typename AllocatorT = MallocAllocator, size_t SlabSize = 4096,
-           size_t SizeThreshold = SlabSize, size_t GrowthDelay = 128,
--          size_t MinAlign = 8>
-+          size_t MinAlign = std::min<size_t>(8, alignof(std::max_align_t))>
- class BumpPtrAllocatorImpl
-     : public AllocatorBase<BumpPtrAllocatorImpl<
-           AllocatorT, SlabSize, SizeThreshold, GrowthDelay, MinAlign>>,


Home | Main Index | Thread Index | Old Index