diff --git a/devel/clang-tools-extra/Makefile b/devel/clang-tools-extra/Makefile
index c5f7e0ca2a7..74660973b13 100644
--- a/devel/clang-tools-extra/Makefile
+++ b/devel/clang-tools-extra/Makefile
@@ -13,6 +13,7 @@ DPB_PROPERTIES =	parallel
 COMMENT=	Clang extra tools
 
 LLVM_V =	22.1.6
+REVISION =	0
 DISTNAME =	llvm-project-${LLVM_V}.src
 PKGNAME=	clang-tools-extra-${LLVM_V}
 
diff --git a/devel/clang-tools-extra/patches/patch-llvm_utils_TableGen_Basic_CMakeLists_txt b/devel/clang-tools-extra/patches/patch-llvm_utils_TableGen_Basic_CMakeLists_txt
new file mode 100644
index 00000000000..64567f12040
--- /dev/null
+++ b/devel/clang-tools-extra/patches/patch-llvm_utils_TableGen_Basic_CMakeLists_txt
@@ -0,0 +1,12 @@
+Index: llvm/utils/TableGen/Basic/CMakeLists.txt
+--- llvm/utils/TableGen/Basic/CMakeLists.txt.orig
++++ llvm/utils/TableGen/Basic/CMakeLists.txt
+@@ -24,6 +24,8 @@ add_llvm_library(LLVMTableGenBasic OBJECT EXCLUDE_FROM
+   VTEmitter.cpp
+ )
+ 
++add_definitions(-D_LIBCPP_USE_LOWER_DEQUE_BLOCK_SIZE)
++
+ # Users may include its headers as "Basic/*.h"
+ target_include_directories(LLVMTableGenBasic
+   INTERFACE
diff --git a/devel/clang-tools-extra/patches/patch-llvm_utils_TableGen_CMakeLists_txt b/devel/clang-tools-extra/patches/patch-llvm_utils_TableGen_CMakeLists_txt
new file mode 100644
index 00000000000..f286fd93058
--- /dev/null
+++ b/devel/clang-tools-extra/patches/patch-llvm_utils_TableGen_CMakeLists_txt
@@ -0,0 +1,9 @@
+Index: llvm/utils/TableGen/CMakeLists.txt
+--- llvm/utils/TableGen/CMakeLists.txt.orig
++++ llvm/utils/TableGen/CMakeLists.txt
+@@ -81,3 +81,5 @@ add_tablegen(llvm-tblgen LLVM
+   DEPENDS
+   intrinsics_gen # via llvm-min-tablegen
+   )
++
++add_definitions(-D_LIBCPP_USE_LOWER_DEQUE_BLOCK_SIZE)
diff --git a/devel/clang-tools-extra/patches/patch-llvm_utils_TableGen_Common_CMakeLists_txt b/devel/clang-tools-extra/patches/patch-llvm_utils_TableGen_Common_CMakeLists_txt
new file mode 100644
index 00000000000..2cac9c9a523
--- /dev/null
+++ b/devel/clang-tools-extra/patches/patch-llvm_utils_TableGen_Common_CMakeLists_txt
@@ -0,0 +1,12 @@
+Index: llvm/utils/TableGen/Common/CMakeLists.txt
+--- llvm/utils/TableGen/Common/CMakeLists.txt.orig
++++ llvm/utils/TableGen/Common/CMakeLists.txt
+@@ -44,6 +44,8 @@ add_llvm_library(LLVMTableGenCommon STATIC OBJECT EXCL
+   intrinsics_gen
+   )
+ 
++add_definitions(-D_LIBCPP_USE_LOWER_DEQUE_BLOCK_SIZE)
++
+ # Users may include its headers as "Common/*.h"
+ target_include_directories(LLVMTableGenCommon
+   PUBLIC