From 327d1eaa73387823d03bc25046049c2ecf4fde56 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 3 Jun 2023 14:53:53 +0200
Subject: [PATCH] rebase of the patch

---
 debian/patches/openmp-fix-runtimes-build.diff | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff
index 5caf41c6..8fcbac71 100644
--- a/debian/patches/openmp-fix-runtimes-build.diff
+++ b/debian/patches/openmp-fix-runtimes-build.diff
@@ -2,10 +2,10 @@ include required runtimes as dependencies to openmp targets to make sure
 they are built first when included as part of a runtimes build since openmp
 can depend on them
 <<<<<<< Updated upstream
-Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/llvm/runtimes/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/llvm/runtimes/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/llvm/runtimes/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/llvm/runtimes/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/llvm/runtimes/CMakeLists.txt
 @@ -236,6 +236,7 @@ function(runtime_default_target)
                                        -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED}
                                        -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR}
@@ -23,12 +23,12 @@ Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/llvm/runtimes/CM
      # We need to add the runtimes as a dependency because compiler-rt can be
      # built as part of runtimes and we need the profile runtime for PGO
      add_dependencies(clang-bootstrap-deps runtimes)
-Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/CMakeLists.txt
 @@ -94,6 +94,28 @@ else()
-   set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
+   get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include)
  endif()
  
 +option(OPENMP_USE_LLVM_UNWINDER "Build and use the LLVM unwinder" OFF)
@@ -56,10 +56,10 @@ Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/CMakeList
  # Build host runtime library, after LIBOMPTARGET variables are set since they are needed
  # to enable time profiling support in the OpenMP runtime.
  add_subdirectory(runtime)
-Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptarget/plugins/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/libomptarget/plugins/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/libomptarget/plugins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptarget/plugins/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/libomptarget/plugins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/libomptarget/plugins/CMakeLists.txt
 @@ -48,6 +48,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
        NO_INSTALL_RPATH
      )
@@ -69,10 +69,10 @@ Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptar
      # Install plugin under the lib destination folder.
      install(TARGETS "omptarget.rtl.${tmachine_libname}"
        LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
-Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 @@ -55,6 +55,8 @@ endif()
  target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA")
  target_include_directories(omptarget.rtl.cuda PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
@@ -82,10 +82,10 @@ Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptar
  # Install plugin under the lib destination folder.
  install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
  set_target_properties(omptarget.rtl.cuda PROPERTIES 
-Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptarget/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/libomptarget/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/libomptarget/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptarget/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/libomptarget/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/libomptarget/src/CMakeLists.txt
 @@ -36,7 +36,9 @@ add_llvm_library(omptarget
    omp
  
@@ -97,10 +97,10 @@ Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/libomptar
  target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
  
  if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
-Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/runtime/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/runtime/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/runtime/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/runtime/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/runtime/CMakeLists.txt
 @@ -292,6 +292,10 @@ if(LIBOMP_STATS)
    set(LIBOMP_USE_STDCPPLIB TRUE)
  endif()
@@ -112,10 +112,10 @@ Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/runtime/C
  # Shared library can be switched to a static library
  set(LIBOMP_ENABLE_SHARED TRUE CACHE BOOL
    "Shared library instead of static library?")
-Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/runtime/src/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/runtime/src/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/runtime/src/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/runtime/src/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/runtime/src/CMakeLists.txt
 @@ -139,6 +139,7 @@ set_source_files_properties(${LIBOMP_ASM
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
@@ -133,10 +133,10 @@ Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/runtime/s
  # Get the library's location within the build tree for the unit tester
  if(NOT WIN32)
    get_target_property(LIBOMP_LIBRARY_DIR omp LIBRARY_OUTPUT_DIRECTORY)
-Index: llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/tools/archer/CMakeLists.txt
+Index: llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/tools/archer/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230603110125+d072d110227d.orig/openmp/tools/archer/CMakeLists.txt
-+++ llvm-toolchain-snapshot_17~++20230603110125+d072d110227d/openmp/tools/archer/CMakeLists.txt
+--- llvm-toolchain-snapshot_17~++20230603025206+0beffb854209.orig/openmp/tools/archer/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230603025206+0beffb854209/openmp/tools/archer/CMakeLists.txt
 @@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER
    target_link_libraries(archer ${CMAKE_DL_LIBS})
    add_library(archer_static STATIC ompt-tsan.cpp)