diff --git a/.gitignore b/.gitignore index 458f0d6..eb6c991 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /openmp-6.0.0.src.tar.xz /openmp-6.0.1rc1.src.tar.xz /openmp-6.0.1.src.tar.xz +/openmp-7.0.0rc1.src.tar.xz diff --git a/0001-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-a-cache-varia.patch b/0001-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-a-cache-varia.patch index 65cd593..c26e4de 100644 --- a/0001-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-a-cache-varia.patch +++ b/0001-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-a-cache-varia.patch @@ -1,4 +1,4 @@ -From e167844878416cd7e7ab9eee58f1ce56650b56f1 Mon Sep 17 00:00:00 2001 +From 156a23f5d91c35edd888091b3d6416b755fa134d 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 @@ -10,18 +10,20 @@ This way it can be overriden on the command line. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/src/CMakeLists.txt b/runtime/src/CMakeLists.txt -index 8545fe2..9312721 100644 +index f9e63f4..2bf6796 100644 --- a/runtime/src/CMakeLists.txt +++ b/runtime/src/CMakeLists.txt -@@ -282,7 +282,7 @@ add_dependencies(libomp-micro-tests libomp-test-deps) +@@ -282,8 +282,8 @@ add_dependencies(libomp-micro-tests libomp-test-deps) + # Install rules # 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}) - set(LIBOMP_HEADERS_INSTALL_PATH lib${OPENMP_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) + set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include") -- 1.8.3.1 diff --git a/libomp.spec b/libomp.spec index 291ccb5..2a5dac6 100644 --- a/libomp.spec +++ b/libomp.spec @@ -4,14 +4,16 @@ %global libomp_arch %{_arch} %endif +%global rc_ver 1 + Name: libomp -Version: 6.0.1 -Release: 3%{?dist} +Version: 7.0.0 +Release: 0.1.rc%{rc_ver}%{?dist} Summary: OpenMP runtime for clang License: NCSA URL: http://openmp.llvm.org -Source0: http://llvm.org/releases/%{version}/openmp-%{version}%{?rc_ver:rc%{rc_ver}}.src.tar.xz +Source0: http://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver}}/openmp-%{version}%{?rc_ver:rc%{rc_ver}}.src.tar.xz Source1: runtest.sh Patch0: 0001-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-a-cache-varia.patch @@ -130,6 +132,9 @@ install -m 0755 %{SOURCE1} %{buildroot}%{_datadir}/libomp %{_datadir}/libomp %changelog +* Tue Aug 14 2018 Tom Stellard - 7.0.0-0.1.rc1 +- 7.0.1-rc1 Release + * Fri Jul 13 2018 Fedora Release Engineering - 6.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 046d417..bf55ac1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openmp-6.0.1.src.tar.xz) = abb956583e5d11d0c6f6d97183c081d658616a74933be884a591eaa3d8c4bb04f08f02016d2c86d7384c7ff1aa44fb949b0d967fc0ff50e3132aaba412e9add8 +SHA512 (openmp-7.0.0rc1.src.tar.xz) = 3b5adf5f07f336ebb2c12ee580f5250718439a5211d7003fa974d349c494d435a9a6566c0aacc4acb778421c1f910dbf756372502b9df4300a2df7b146bb8f00