diff --git a/debian/patches/bootstrap-fix-include-next.diff b/debian/patches/bootstrap-fix-include-next.diff
index 4a638e61..8f2fd783 100644
--- a/debian/patches/bootstrap-fix-include-next.diff
+++ b/debian/patches/bootstrap-fix-include-next.diff
@@ -13,10 +13,10 @@ include search path, clang's header will call itself without any effect.
 Therefore, it will do include_next until the define from the libc is existing (ex: _INTTYPES_H)
 
 
-Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Headers/inttypes.h
+Index: llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412/clang/lib/Headers/inttypes.h
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/lib/Headers/inttypes.h
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Headers/inttypes.h
+--- llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412.orig/clang/lib/Headers/inttypes.h
++++ llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412/clang/lib/Headers/inttypes.h
 @@ -6,7 +6,7 @@
   *
  \*===----------------------------------------------------------------------===*/
@@ -26,10 +26,10 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Header
  // AIX system headers need inttypes.h to be re-enterable while _STD_TYPES_T
  // is defined until an inclusion of it without _STD_TYPES_T occurs, in which
  // case the header guard macro is defined.
-Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Headers/limits.h
+Index: llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412/clang/lib/Headers/limits.h
 ===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/lib/Headers/limits.h
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Headers/limits.h
+--- llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412.orig/clang/lib/Headers/limits.h
++++ llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412/clang/lib/Headers/limits.h
 @@ -6,7 +6,7 @@
   *
  \*===----------------------------------------------------------------------===*/
@@ -38,4 +38,4 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Header
 +#if !defined(__CLANG_LIMITS_H) || !defined(_LIBC_LIMITS_H_)
  #define __CLANG_LIMITS_H
  
- /* The system's limits.h may, in turn, try to #include_next GCC's limits.h.
+ #if defined(__MVS__) && __has_include_next(<limits.h>)
diff --git a/debian/patches/lldb/lldb-soname.diff b/debian/patches/lldb/lldb-soname.diff
index e4ac1452..dbd0db8c 100644
--- a/debian/patches/lldb/lldb-soname.diff
+++ b/debian/patches/lldb/lldb-soname.diff
@@ -2,13 +2,13 @@
  lldb/source/API/CMakeLists.txt |   14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
-Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/lldb/source/API/CMakeLists.txt
+Index: llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412/lldb/source/API/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/lldb/source/API/CMakeLists.txt
-+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/lldb/source/API/CMakeLists.txt
-@@ -24,7 +24,12 @@ lldb_tablegen(../../include/lldb/API/SBL
-   SOURCE ${LLVM_MAIN_INCLUDE_DIR}/llvm/BinaryFormat/Dwarf.def
-   TARGET lldb-sbapi-dwarf-enums)
+--- llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412.orig/lldb/source/API/CMakeLists.txt
++++ llvm-toolchain-snapshot_19~++20240502082504+e3f42b02a412/lldb/source/API/CMakeLists.txt
+@@ -34,7 +34,12 @@ add_custom_target(
+   WORKING_DIRECTORY ${LLVM_LIBRARY_OUTPUT_INTDIR}
+ )
  
 -add_lldb_library(liblldb SHARED ${option_framework}
 +set(output_name lldb)
@@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/lldb/source/API/
    SBAddress.cpp
    SBAttachInfo.cpp
    SBBlock.cpp
-@@ -176,7 +181,7 @@ endif()
+@@ -186,7 +191,7 @@ endif()
  
  set_target_properties(liblldb
    PROPERTIES
@@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/lldb/source/API/
  )
  
  target_compile_definitions(liblldb PRIVATE LLDB_IN_LIBLLDB)
-@@ -242,12 +247,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS)
+@@ -252,12 +257,12 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS)
    set_target_properties(liblldb_exports PROPERTIES FOLDER "lldb misc")
  endif()