From 66b1a24c79c41f5233a1d220b4e6e665d1495f98 Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Thu, 25 Feb 2021 15:24:50 +0100 Subject: [PATCH] Cleanup, rename and normalize patch serie --- ...ke-Make-LIBOMP_HEADERS_INSTALL_PATH-.patch | 24 +++++++++---------- libomp.spec | 2 +- 2 files changed, 12 insertions(+), 14 deletions(-) rename 0001-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-a-cache-varia.patch => 0001-PATCH-openmp-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-.patch (52%) diff --git a/0001-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-a-cache-varia.patch b/0001-PATCH-openmp-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-.patch similarity index 52% rename from 0001-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-a-cache-varia.patch rename to 0001-PATCH-openmp-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-.patch index c26e4de..eedd1ee 100644 --- a/0001-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-a-cache-varia.patch +++ b/0001-PATCH-openmp-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-.patch @@ -1,25 +1,23 @@ -From 156a23f5d91c35edd888091b3d6416b755fa134d Mon Sep 17 00:00:00 2001 +From f2c9c1c9cda831a4305e2dc8899d630ed727353a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 16 May 2017 11:52:19 -0400 -Subject: [PATCH] CMake: Make LIBOMP_HEADERS_INSTALL_PATH a cache variable when - bulding standalone +Subject: [PATCH] [PATCH][openmp] CMake: Make LIBOMP_HEADERS_INSTALL_PATH a + cache variable when bulding standalone This way it can be overriden on the command line. --- - runtime/src/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + openmp/runtime/src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/runtime/src/CMakeLists.txt b/runtime/src/CMakeLists.txt -index f9e63f4..2bf6796 100644 ---- a/runtime/src/CMakeLists.txt -+++ b/runtime/src/CMakeLists.txt -@@ -282,8 +282,8 @@ add_dependencies(libomp-micro-tests libomp-test-deps) - # Install rules +diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt +index 822f9ca..583a3c3 100644 +--- a/openmp/runtime/src/CMakeLists.txt ++++ b/openmp/runtime/src/CMakeLists.txt +@@ -305,7 +305,7 @@ add_dependencies(libomp-micro-tests libomp-test-deps) # We want to install libomp in DESTDIR/CMAKE_INSTALL_PREFIX/lib # We want to install headers in DESTDIR/CMAKE_INSTALL_PREFIX/include --if(${OPENMP_STANDALONE_BUILD}) + if(${OPENMP_STANDALONE_BUILD}) - set(LIBOMP_HEADERS_INSTALL_PATH include) -+if(${OPENMP_STANDALONE_BUILD}) + set(LIBOMP_HEADERS_INSTALL_PATH include CACHE PATH "Install path for OpenMP headers") else() string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION ${PACKAGE_VERSION}) diff --git a/libomp.spec b/libomp.spec index 0b2e538..a3e78d1 100644 --- a/libomp.spec +++ b/libomp.spec @@ -22,7 +22,7 @@ Source2: tstellar-gpg-key.asc Source3: run-lit-tests Source4: lit.fedora.cfg.py -Patch0: 0001-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-a-cache-varia.patch +Patch0: 0001-PATCH-openmp-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-.patch BuildRequires: gcc BuildRequires: gcc-c++