From 0a5e4480adf8012a49e14b3eb9dbac3fb0d8342e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 3 Nov 2020 07:08:48 -0500 Subject: [PATCH] import libomp-10.0.1-1.module+el8.3.0+7459+90c24896 --- .gitignore | 3 ++- .libomp.metadata | 3 ++- SOURCES/99b03c1c18.patch | 39 +++++++++++++++++++++++++++ SOURCES/openmp-10.0.1.src.tar.xz.sig | Bin 0 -> 566 bytes SPECS/libomp.spec | 33 +++++++++++++++++++---- 5 files changed, 71 insertions(+), 7 deletions(-) create mode 100644 SOURCES/99b03c1c18.patch create mode 100644 SOURCES/openmp-10.0.1.src.tar.xz.sig diff --git a/.gitignore b/.gitignore index 198f449..e83d8dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/openmp-9.0.1.src.tar.xz +SOURCES/hans-gpg-key.asc +SOURCES/openmp-10.0.1.src.tar.xz diff --git a/.libomp.metadata b/.libomp.metadata index ad71965..8b46fe9 100644 --- a/.libomp.metadata +++ b/.libomp.metadata @@ -1 +1,2 @@ -b23687827cb69da01fb3ea1234b708ab604def22 SOURCES/openmp-9.0.1.src.tar.xz +32fa4b0193960f05064f2ab31b5a89c7cf48a0b9 SOURCES/hans-gpg-key.asc +5c7043bd0c4746a115edb38fe8e587d805b61d12 SOURCES/openmp-10.0.1.src.tar.xz diff --git a/SOURCES/99b03c1c18.patch b/SOURCES/99b03c1c18.patch new file mode 100644 index 0000000..2de5faf --- /dev/null +++ b/SOURCES/99b03c1c18.patch @@ -0,0 +1,39 @@ +diff --git a/runtime/test/lit.cfg b/runtime/test/lit.cfg +index 8ff668a..8e15a38 100644 +--- a/runtime/test/lit.cfg ++++ b/runtime/test/lit.cfg +@@ -100,6 +100,13 @@ if config.operating_system == 'NetBSD': + if config.operating_system in ['Linux', 'Windows']: + config.available_features.add('affinity') + ++import multiprocessing ++try: ++ if multiprocessing.cpu_count() > 1: ++ config.available_features.add('multicpu') ++except NotImplementedError: ++ pass ++ + # to run with icc INTEL_LICENSE_FILE must be set + if 'INTEL_LICENSE_FILE' in os.environ: + config.environment['INTEL_LICENSE_FILE'] = os.environ['INTEL_LICENSE_FILE'] +diff --git a/runtime/test/ompt/teams/parallel_team.c b/runtime/test/ompt/teams/parallel_team.c +index 15d9b6c..96ce0d5 100644 +--- a/runtime/test/ompt/teams/parallel_team.c ++++ b/runtime/test/ompt/teams/parallel_team.c +@@ -1,5 +1,5 @@ + // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %s +-// REQUIRES: ompt ++// REQUIRES: ompt, multicpu + // UNSUPPORTED: gcc + #include "callback.h" + +diff --git a/runtime/test/ompt/teams/serial_teams.c b/runtime/test/ompt/teams/serial_teams.c +index 64d0c89..abd3db5 100644 +--- a/runtime/test/ompt/teams/serial_teams.c ++++ b/runtime/test/ompt/teams/serial_teams.c +@@ -1,5 +1,5 @@ + // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %s +-// REQUIRES: ompt ++// REQUIRES: ompt, multicpu + // UNSUPPORTED: gcc + #include "callback.h" diff --git a/SOURCES/openmp-10.0.1.src.tar.xz.sig b/SOURCES/openmp-10.0.1.src.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000..c87e0d26f5ed3ceb2fa510b306dde295b356fa13 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0$&%0lK=_{5TeJF zsfIzFipaPR{xmM!RbW~k#2rIe$x0grK9HnFaLjo{dk@_R3J@8^6Q$J;LT_cs;%$(U z1EFo0e5SR>Rc3^`SMaPqfzR(kLT{6O^2l@~r zG5C6O|9tXewSy&s1OIw#pJJTiuc;egPARAqAa@@^@d5PjUS*%tHCbfIY`OO;Kn;gd za0)FqMMKoMP?2Z+*RA>hZv!Qzo$x8(>t1t|XkHRDRC&gFEoacqvWaMC>eR%~Rv zPGk{pJ6mtqov>}?yrw#*N?%dm?ZyMe@{fVc1t}kh_ByCxS0R$Vy8jETV&8bo z)y7|IFn9CeMD7{*esmV~b_D1jv_A>09Iob&4Z{681zQuzl-63)p~mGyZyj2*!|n(3 z2a9dhF1;d77rnE;6-887w^Q8-@logJ=ie7r=0^Qyp3@pU3#Um(_7! EIIwF89RL6T literal 0 HcmV?d00001 diff --git a/SPECS/libomp.spec b/SPECS/libomp.spec index 7ed770b..9492dab 100644 --- a/SPECS/libomp.spec +++ b/SPECS/libomp.spec @@ -1,4 +1,4 @@ -#%%global rc_ver 3 +#%%global rc_ver 6 %global baserelease 1 %global libomp_srcdir openmp-%{version}%{?rc_ver:rc%{rc_ver}}.src @@ -10,17 +10,25 @@ %endif Name: libomp -Version: 9.0.1 +Version: 10.0.1 Release: %{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist} Summary: OpenMP runtime for clang License: NCSA URL: http://openmp.llvm.org -Source0: http://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver}}/%{libomp_srcdir}.tar.xz +%if 0%{?rc_ver:1} +Source0: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{libomp_srcdir}.tar.xz +Source3: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{libomp_srcdir}.tar.xz.sig +%else +Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{libomp_srcdir}.tar.xz +Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{libomp_srcdir}.tar.xz.sig +%endif Source1: run-lit-tests Source2: lit.fedora.cfg.py +Source4: https://prereleases.llvm.org/%{version}/hans-gpg-key.asc Patch0: 0001-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-a-cache-varia.patch +Patch1: 99b03c1c18.patch BuildRequires: cmake BuildRequires: elfutils-libelf-devel @@ -47,7 +55,7 @@ OpenMP header files. %package test Summary: OpenMP regression tests Requires: %{name}%{?isa} = %{version} -Requires: %{name}-devel%{?isa} = %{version} +Requires: %{name}-devel%{?isa} = %{version}-%{release} Requires: clang Requires: llvm Requires: gcc @@ -58,7 +66,7 @@ Requires: python3-lit OpenMP regression tests %prep -%autosetup -n openmp-%{version}%{?rc_ver:rc%{rc_ver}}.src -p1 +%autosetup -n %{libomp_srcdir} -p1 %build mkdir -p _build @@ -103,10 +111,16 @@ echo "lit_config.load_config(config, '%{lit_fedora_cfg}')" >> %{buildroot}%{lit_ install -d %{buildroot}%{_libexecdir}/tests/libomp install -m 0755 %{SOURCE1} %{buildroot}%{_libexecdir}/tests/libomp +# Remove static libraries with equivalent shared libraries +rm -rf %{buildroot}%{_libdir}/libarcher_static.a + %files %{_libdir}/libomp.so %{_libdir}/libomptarget.so +%ifnarch %{arm} +%{_libdir}/libarcher.so +%endif %ifnarch %{arm} %{ix86} %{_libdir}/libomptarget.rtl.%{libomp_arch}.so %endif @@ -123,6 +137,15 @@ install -m 0755 %{SOURCE1} %{buildroot}%{_libexecdir}/tests/libomp %{_libexecdir}/tests/libomp/ %changelog +* Fri Jul 24 2020 sguelton@redhat.com - 10.0.1-1 +- 10.0.1 final + +* Mon Jun 15 2020 sguelton@redhat.com - 10.0.0-2 +- Better dependency specification, see rhbz#1841180 + +* Thu Apr 9 2020 sguelton@redhat.com - 10.0.0-1 +- 10.0.0 final + * Thu Dec 19 2019 Tom Stellard - 9.0.1-1 - 9.0.1 Release