From 8d53dd9516dac882f0a1ae5e772afbc2186ba4c8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Fri, 19 Nov 2021 04:56:54 +0000 Subject: [PATCH] import libomp-13.0.0-1.module+el8.6.0+13042+9f423c45 --- .gitignore | 2 +- .libomp.metadata | 2 +- SOURCES/openmp-12.0.1.src.tar.xz.sig | Bin 566 -> 0 bytes SOURCES/openmp-13.0.0.src.tar.xz.sig | Bin 0 -> 566 bytes SPECS/libomp.spec | 42 ++++++++++++++++++++------- 5 files changed, 34 insertions(+), 12 deletions(-) delete mode 100644 SOURCES/openmp-12.0.1.src.tar.xz.sig create mode 100644 SOURCES/openmp-13.0.0.src.tar.xz.sig diff --git a/.gitignore b/.gitignore index 6c2b3f1..948a604 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/openmp-12.0.1.src.tar.xz +SOURCES/openmp-13.0.0.src.tar.xz SOURCES/tstellar-gpg-key.asc diff --git a/.libomp.metadata b/.libomp.metadata index 3caeb77..8e7e6f6 100644 --- a/.libomp.metadata +++ b/.libomp.metadata @@ -1,2 +1,2 @@ -7c051f6050ff23763b253a757927774b5eeaf644 SOURCES/openmp-12.0.1.src.tar.xz +8bec3e9afd374e97e4b83212a0ab681ae329f337 SOURCES/openmp-13.0.0.src.tar.xz b8d2648a01d36ed0186fd2c5af325fd28797f9a0 SOURCES/tstellar-gpg-key.asc diff --git a/SOURCES/openmp-12.0.1.src.tar.xz.sig b/SOURCES/openmp-12.0.1.src.tar.xz.sig deleted file mode 100644 index b20d8213bb70069d50b1952fd26c357809265199..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0$}Ie&;SYv5TeJF zsfIzFik$2a0DxodmN9*5j*V%jR*HqdVPcd%>rD}%8F@gX-Pzo=?f-iX^$WvTFuOx4 zr>ZxHUM!ct4SFai%xU$IkFTzklBV<^S=G(tporCPa?@svbp)F!=CvS0u0b`m)ML<9 z=p)8AzEU!lhBG>&eE(LYCdZo(rZpE$V6+dj8E6ECK5u*fPfgInIk~?P2yRHU7=P))HvfRyU0N65fnM*&(ZmM$QIe$B?%14Olco$#ydVfhN>JMbcONiIdf)_vv`@W6`Gf@PhO^MV_Lm5o;xGX_wysMnE=i%FACTDTb9fNg4cCxT|L>bP E6(&3mI{*Lx diff --git a/SOURCES/openmp-13.0.0.src.tar.xz.sig b/SOURCES/openmp-13.0.0.src.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000..7cdf2002b6400fbb5517e75640553d8152e1a860 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0%2BraR3Sl5TeJF zsfIzFiiyP#0HKc*%0Y?)u}46pjmfMYokpD8#9b&XKw_-eDU?wp?UK0qjYl}zF(o^E zcMugS`Syif_5Rm7%9v1<0IzJw_%Ftwq$;6$) zRKplK+8RuK;N*@PMj6*wsFwY$jwab53 z9%4uILV8tH2V0x=OV1p#>5|s^{Lu!B5WE|kY~IL-9|tTk*Mr~@_~vY7@t71cA|UhK zQ6%daujoy5h7YE3PRAupgjg5srrN3W`X4H#y}|Uh!_TVa2TrcWM{)QhKQn(^F2KRN zBR0bsaZAK97PV0L%e7iW;!Wvn2!^}_8b|Ue8?{m9h-L*-pX?eYJ=N9c`lRE0*mO+~ zs$h_?Cju%`WNd};1}RuJgZ0jFl!%uSROlFy+s*wddPy@2R8>;2ILv8Nmh*k`42u=M zqsq{4hqOa{BDF@Pd0GC~Q$^?iG5IRF3scIr611GY5x|^9dSun>LPo6uMR8C-qpiyQ z4IBt7k&337#_w{0AZ=U3<003-*@TiFm>^E8Yl=?%K<*fSJET~;_I6zCG8UR#(KG;% zq#lLD?DXZ(Zk}aJ7;>4Z*rk0Jkz$#A+ycZAFBa&0NxBt){4}16o+oQIo5JieY0h6| E^E4R|l>h($ literal 0 HcmV?d00001 diff --git a/SPECS/libomp.spec b/SPECS/libomp.spec index 0f40bd4..d9686ed 100644 --- a/SPECS/libomp.spec +++ b/SPECS/libomp.spec @@ -1,5 +1,6 @@ -#%%global rc_ver 5 -%global libomp_srcdir openmp-%{version}%{?rc_ver:rc%{rc_ver}}.src +%global libomp_version 13.0.0 +#global rc_ver 3 +%global libomp_srcdir openmp-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src %ifarch ppc64le @@ -9,14 +10,14 @@ %endif Name: libomp -Version: 12.0.1%{?rc_ver:~rc%{rc_ver}} +Version: %{libomp_version}%{?rc_ver:~rc%{rc_ver}} Release: 1%{?dist} Summary: OpenMP runtime for clang License: NCSA URL: http://openmp.llvm.org -Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz -Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz.sig +Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz +Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz.sig Source2: tstellar-gpg-key.asc Source3: run-lit-tests Source4: lit.fedora.cfg.py @@ -32,6 +33,14 @@ BuildRequires: perl BuildRequires: perl-Data-Dumper BuildRequires: perl-Encode BuildRequires: libffi-devel +BuildRequires: ncurses-devel + +# The AMDGCN device RTL requires clang and llvm-link to build +BuildRequires: clang +BuildRequires: llvm + +# libomptarget needs the llvm cmake files +BuildRequires: llvm-devel Requires: elfutils-libelf%{?isa} @@ -66,6 +75,7 @@ OpenMP regression tests %build # LTO causes build failures in this package. Disable LTO for now +# https://bugzilla.redhat.com/show_bug.cgi?id=1988155 %define _lto_cflags %{nil} mkdir -p %{_vpath_builddir} @@ -73,7 +83,8 @@ cd %{_vpath_builddir} %cmake .. -GNinja \ -DLIBOMP_INSTALL_ALIASES=OFF \ - -DLIBOMP_HEADERS_INSTALL_PATH:PATH=%{_libdir}/clang/%{version}/include \ + -DLLVM_DIR=%{_libdir}/cmake/llvm \ + -DLIBOMP_HEADERS_INSTALL_PATH:PATH=%{_libdir}/clang/%{libomp_version}/include \ %if 0%{?__isa_bits} == 64 -DOPENMP_LIBDIR_SUFFIX=64 \ %else @@ -119,17 +130,25 @@ cd %{_vpath_builddir} %cmake_build --target check-openmp %files -%license LICENSE.txt +%license LICENSE.TXT %{_libdir}/libomp.so %ifnarch %{arm} %{_libdir}/libarcher.so %endif +%ifnarch %{ix86} %{arm} +%{_libdir}/libomptarget-amdgcn*.bc +%{_libdir}/libomptarget.rtl.amdgpu.so +%{_libdir}/libomptarget.rtl.cuda.so +%{_libdir}/libomptarget.rtl.%{libomp_arch}.so +%endif +%{_libdir}/libomptarget.so %files devel -%{_libdir}/clang/%{version}/include/omp.h +%{_libdir}/clang/%{libomp_version}/include/omp.h +%{_libdir}/cmake/openmp/FindOpenMPTarget.cmake %ifnarch %{arm} -%{_libdir}/clang/%{version}/include/omp-tools.h -%{_libdir}/clang/%{version}/include/ompt.h +%{_libdir}/clang/%{libomp_version}/include/omp-tools.h +%{_libdir}/clang/%{libomp_version}/include/ompt.h # FIXME: This is probably wrong. Seems like LIBOMP_HEADERS_INSTALL may # not be respected. %{_includedir}/ompt-multiplex.h @@ -140,6 +159,9 @@ cd %{_vpath_builddir} %{_libexecdir}/tests/libomp/ %changelog +* Fri Oct 15 2021 Tom Stellard - 13.0.0-1 +- 13.0.0 Release + * Fri Jul 16 2021 sguelton@redhat.com - 12.0.1-1 - 12.0.1 release