diff --git a/.libomp.metadata b/.libomp.metadata new file mode 100644 index 0000000..2ddbcbc --- /dev/null +++ b/.libomp.metadata @@ -0,0 +1,2 @@ +8354a371042267a121f2b4e27c03f74f9eeff994 openmp-17.0.6.src.tar.xz.sig +d633a8e324689c7bf20528c99b3130ba1796fe1d openmp-17.0.6.src.tar.xz diff --git a/libomp.spec b/libomp.spec index 0567aec..8986aa9 100644 --- a/libomp.spec +++ b/libomp.spec @@ -8,10 +8,9 @@ %global toolchain gcc %global maj_ver 17 -%global libomp_version %{maj_ver}.0.1 +%global libomp_version %{maj_ver}.0.6 #global rc_ver 4 %global libomp_srcdir openmp-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src -%global cmake_srcdir cmake-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src %global so_suffix %{maj_ver} %if %{with snapshot_build} @@ -34,7 +33,7 @@ Name: libomp Version: %{libomp_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: OpenMP runtime for clang License: Apache-2.0 WITH LLVM-exception OR NCSA @@ -47,8 +46,6 @@ Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz.sig Source2: release-keys.asc %endif -Source5: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz -Source6: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz.sig BuildRequires: clang >= %{maj_ver} # For clang-offload-packager @@ -90,12 +87,6 @@ OpenMP header files. %if %{without snapshot_build} %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %endif -%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE6}' --data='%{SOURCE5}' -%setup -T -q -b 5 -n %{cmake_srcdir} -# TODO: It would be more elegant to set -DLLVM_COMMON_CMAKE_UTILS=%{_builddir}/%{cmake_srcdir}, -# but this is not a CACHED variable, so we can't actually set it externally :( -cd .. -mv %{cmake_srcdir} cmake %autosetup -n %{libomp_srcdir} -p2 %build @@ -104,7 +95,6 @@ mv %{cmake_srcdir} cmake # Building openmp with LTO fails with GCC but works with Clang %define _lto_cflags %{nil} %endif -# TODO: LIBOMP_HAVE_VERSION_SCRIPT_FLAG should be set automatically. %cmake -GNinja \ -DLIBOMP_INSTALL_ALIASES=OFF \ -DCMAKE_MODULE_PATH=%{_datadir}/llvm/cmake/Modules \ @@ -118,8 +108,7 @@ mv %{cmake_srcdir} cmake %if %{with snapshot_build} -DLLVM_VERSION_SUFFIX="%{llvm_snapshot_version_suffix}" \ %endif - -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DLIBOMP_HAVE_VERSION_SCRIPT_FLAG:BOOL=ON + -DCMAKE_SKIP_RPATH:BOOL=ON %cmake_build @@ -170,6 +159,9 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a %changelog %{?llvm_snapshot_changelog_entry} +* Mon Dec 11 2023 Timm Bäder - 17.0.6-1 +- Update to 17.0.6 + * Fri Oct 20 2023 Timm Bäder - 17.0.1-2 - Add obsoletes for libomp-test package. diff --git a/sources b/sources index 754fe28..a4e0de6 100644 --- a/sources +++ b/sources @@ -1,4 +1,2 @@ -SHA512 (cmake-17.0.1.src.tar.xz.sig) = 3324dd7a76983d8fdf1d9201fb38cec643261556f461b706b9030ff64ba7d8819ecb4e2954e9a8c0b4181e0f2dadbcb3fb51181bc5885b87c11c9021addbdf71 -SHA512 (cmake-17.0.1.src.tar.xz) = fdfa055cb1d605669efc7b4d72be512bf8eacf681dc34f3c5fbf3fd0c99c8eec9dd5ab8904aac1b8e96fef54b936e0d7bbf0f1868c9baa0893fdd97dd39d92f1 -SHA512 (openmp-17.0.1.src.tar.xz) = cef4fb18158b7a995439190acb81dbd0e7a24d308255ba91bde39f9c4a9367329b2b2fd9b9eb0398a57f1c544062e7d4877d753101eeff76734a2c440116fa1f -SHA512 (openmp-17.0.1.src.tar.xz.sig) = cff5cc886cb2ad85abf09021a44f7685aec2ffba0d461539b96de9891d01453d5f23e5ba36a96e529a71af03af1b7cd73260d99a095e5a4a128639a6b582a567 +SHA512 (openmp-17.0.6.src.tar.xz.sig) = 58fb951620d3494e016f0eeefb1cd28d86eb9ecc7894163ed96e8818573f6ed6b6f58d63884799fd052c943e5a63dec39193039f8499b99a55bfd8316c24a55f +SHA512 (openmp-17.0.6.src.tar.xz) = 836c48db873e3da64835913c2c1d80efaebdfc7061f153acc7b478ea0d73b9c546a09d70dd1465e3e92684947c4a9cb197886b29cbd42418a778faa56b08cc5e