import UBI libomp-17.0.6-1.module+el8.10.0+20808+e12784c0
This commit is contained in:
parent
6909efe6b0
commit
759f32df65
6
.gitignore
vendored
6
.gitignore
vendored
@ -1,4 +1,2 @@
|
|||||||
SOURCES/cmake-16.0.6.src.tar.xz
|
SOURCES/openmp-17.0.6.src.tar.xz
|
||||||
SOURCES/cmake-16.0.6.src.tar.xz.sig
|
SOURCES/openmp-17.0.6.src.tar.xz.sig
|
||||||
SOURCES/openmp-16.0.6.src.tar.xz
|
|
||||||
SOURCES/openmp-16.0.6.src.tar.xz.sig
|
|
||||||
|
@ -1,4 +1,2 @@
|
|||||||
0de534cfef38697e115c3ae80634765f05e78e5b SOURCES/cmake-16.0.6.src.tar.xz
|
d633a8e324689c7bf20528c99b3130ba1796fe1d SOURCES/openmp-17.0.6.src.tar.xz
|
||||||
2db5c88fe9277bb0fa85f49b58e946e49ff235c2 SOURCES/cmake-16.0.6.src.tar.xz.sig
|
8354a371042267a121f2b4e27c03f74f9eeff994 SOURCES/openmp-17.0.6.src.tar.xz.sig
|
||||||
245926aec76c80db47bed9c1a0c046df3d43ccdf SOURCES/openmp-16.0.6.src.tar.xz
|
|
||||||
b70bc22476df13ca634d73bc20e783e7c0c19997 SOURCES/openmp-16.0.6.src.tar.xz.sig
|
|
||||||
|
@ -1,15 +0,0 @@
|
|||||||
import tempfile
|
|
||||||
|
|
||||||
compiler = '%(libomp_compiler)s' % lit_config.params
|
|
||||||
config.test_filecheck = '%(bindir)s/FileCheck' % lit_config.params
|
|
||||||
config.omp_header_directory = '%(includedir)s' % lit_config.params
|
|
||||||
config.libomp_obj_root = tempfile.mkdtemp()
|
|
||||||
config.library_dir = '%(libdir)s' % lit_config.params
|
|
||||||
test_root = '%(libomp_test_root)s' % lit_config.params
|
|
||||||
|
|
||||||
# Lit will default to the compiler used to build openmp, which is gcc, but we
|
|
||||||
# want to run the tests using clang.
|
|
||||||
config.test_compiler_features = ['clang', 'clang-11']
|
|
||||||
config.test_c_compiler = 'clang'
|
|
||||||
config.test_cxx_compiler = 'clang++'
|
|
||||||
lit_config.load_config(config, '%(libomp_test_root)s/lit.cfg' % lit_config.params)
|
|
@ -1,63 +0,0 @@
|
|||||||
#!/usr/bin/bash
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
usage() {
|
|
||||||
echo "usage: `basename $0` [OPTIONS]"
|
|
||||||
echo " --threads NUM The number of threads to use for running tests."
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
threads_arg=''
|
|
||||||
|
|
||||||
while [ $# -gt 0 ]; do
|
|
||||||
case $1 in
|
|
||||||
--threads)
|
|
||||||
shift
|
|
||||||
threads_arg="--threads $1"
|
|
||||||
;;
|
|
||||||
--multilib-arch)
|
|
||||||
shift
|
|
||||||
ARCH=$1
|
|
||||||
;;
|
|
||||||
* )
|
|
||||||
echo "unknown option: $1"
|
|
||||||
echo ""
|
|
||||||
usage
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
||||||
set -xe
|
|
||||||
|
|
||||||
if [ -z "$ARCH" ]; then
|
|
||||||
ARCH=`rpm --eval '%_arch'`
|
|
||||||
fi
|
|
||||||
|
|
||||||
case $ARCH in
|
|
||||||
arm)
|
|
||||||
;&
|
|
||||||
i686)
|
|
||||||
LIB_DIR="/usr/lib/"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
LIB_DIR="/usr/lib64/"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
BIN_DIR="/usr/bin/"
|
|
||||||
INCLUDE_DIR="/usr/include/"
|
|
||||||
|
|
||||||
lit $threads_arg -v \
|
|
||||||
--config-prefix $ARCH \
|
|
||||||
-Dlibomp_compiler=clang \
|
|
||||||
-Dbindir=$BIN_DIR \
|
|
||||||
-Dlibdir=$LIB_DIR \
|
|
||||||
-Dincludedir=$INCLUDE_DIR \
|
|
||||||
-Dlibomp_test_root=/usr/share/libomp/src/runtime/test \
|
|
||||||
/usr/share/libomp/src/runtime/test
|
|
||||||
|
|
||||||
exit 0
|
|
@ -1,9 +1,26 @@
|
|||||||
%global maj_ver 16
|
%bcond_with snapshot_build
|
||||||
|
|
||||||
|
%if %{with snapshot_build}
|
||||||
|
# Unlock LLVM Snapshot LUA functions
|
||||||
|
%{llvm_sb}
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%global maj_ver 17
|
||||||
%global libomp_version %{maj_ver}.0.6
|
%global libomp_version %{maj_ver}.0.6
|
||||||
#global rc_ver 4
|
#global rc_ver 4
|
||||||
%global libomp_srcdir openmp-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src
|
%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}
|
||||||
|
%undefine rc_ver
|
||||||
|
%global maj_ver %{llvm_snapshot_version_major}
|
||||||
|
%global libomp_version %{llvm_snapshot_version}
|
||||||
|
%global so_suffix %{maj_ver}%{llvm_snapshot_version_suffix}
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=2158587
|
||||||
|
%undefine _include_frame_pointers
|
||||||
|
|
||||||
%ifarch ppc64le
|
%ifarch ppc64le
|
||||||
%global libomp_arch ppc64
|
%global libomp_arch ppc64
|
||||||
@ -11,28 +28,23 @@
|
|||||||
%global libomp_arch %{_arch}
|
%global libomp_arch %{_arch}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifarch %{ix86}
|
|
||||||
%bcond_with testpkg
|
|
||||||
%else
|
|
||||||
%bcond_without testpkg
|
|
||||||
%endif
|
|
||||||
|
|
||||||
Name: libomp
|
Name: libomp
|
||||||
Version: %{libomp_version}%{?rc_ver:~rc%{rc_ver}}
|
Version: %{libomp_version}%{?rc_ver:~rc%{rc_ver}}
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: OpenMP runtime for clang
|
Summary: OpenMP runtime for clang
|
||||||
|
|
||||||
License: NCSA
|
License: NCSA
|
||||||
URL: http://openmp.llvm.org
|
URL: http://openmp.llvm.org
|
||||||
|
%if %{with snapshot_build}
|
||||||
|
Source0: %{llvm_snapshot_source_prefix}openmp-%{llvm_snapshot_yyyymmdd}.src.tar.xz
|
||||||
|
%{llvm_snapshot_extra_source_tags}
|
||||||
|
%else
|
||||||
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz
|
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
|
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
|
Source2: release-keys.asc
|
||||||
Source3: run-lit-tests
|
%endif
|
||||||
Source4: lit.fedora.cfg.py
|
|
||||||
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
|
BuildRequires: clang >= %{maj_ver}
|
||||||
# For clang-offload-packager
|
# For clang-offload-packager
|
||||||
BuildRequires: clang-tools-extra
|
BuildRequires: clang-tools-extra
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
@ -48,12 +60,14 @@ BuildRequires: ncurses-devel
|
|||||||
# For gpg source verification
|
# For gpg source verification
|
||||||
BuildRequires: gnupg2
|
BuildRequires: gnupg2
|
||||||
|
|
||||||
|
|
||||||
# libomptarget needs the llvm cmake files
|
# libomptarget needs the llvm cmake files
|
||||||
BuildRequires: llvm-devel
|
BuildRequires: llvm-devel
|
||||||
|
BuildRequires: llvm-cmake-utils
|
||||||
|
|
||||||
Requires: elfutils-libelf%{?isa}
|
Requires: elfutils-libelf%{?isa}
|
||||||
|
|
||||||
|
Obsoletes: libomp-test < 17.0.3
|
||||||
|
|
||||||
# libomp does not support s390x.
|
# libomp does not support s390x.
|
||||||
ExcludeArch: s390x
|
ExcludeArch: s390x
|
||||||
|
|
||||||
@ -68,50 +82,31 @@ Requires: clang-resource-filesystem%{?isa} = %{version}
|
|||||||
%description devel
|
%description devel
|
||||||
OpenMP header files.
|
OpenMP header files.
|
||||||
|
|
||||||
%if %{with testpkg}
|
|
||||||
|
|
||||||
%package test
|
|
||||||
Summary: OpenMP regression tests
|
|
||||||
Requires: %{name}%{?isa} = %{version}-%{release}
|
|
||||||
Requires: %{name}-devel%{?isa} = %{version}-%{release}
|
|
||||||
Requires: clang
|
|
||||||
Requires: llvm
|
|
||||||
Requires: gcc
|
|
||||||
Requires: gcc-c++
|
|
||||||
Requires: python3-lit
|
|
||||||
|
|
||||||
%description test
|
|
||||||
OpenMP regression tests
|
|
||||||
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
|
%if %{without snapshot_build}
|
||||||
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
||||||
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE6}' --data='%{SOURCE5}'
|
%endif
|
||||||
%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
|
%autosetup -n %{libomp_srcdir} -p2
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
%undefine __cmake_in_source_build
|
||||||
|
|
||||||
# LTO causes build failures in this package. Disable LTO for now
|
# LTO causes build failures in this package. Disable LTO for now
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1988155
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1988155
|
||||||
%define _lto_cflags %{nil}
|
%define _lto_cflags %{nil}
|
||||||
|
|
||||||
mkdir -p %{_vpath_builddir}
|
%cmake -GNinja \
|
||||||
cd %{_vpath_builddir}
|
|
||||||
|
|
||||||
%cmake .. -GNinja \
|
|
||||||
-DLIBOMP_INSTALL_ALIASES=OFF \
|
-DLIBOMP_INSTALL_ALIASES=OFF \
|
||||||
-DCMAKE_MODULE_PATH=%{_libdir}/cmake/llvm \
|
-DCMAKE_MODULE_PATH=%{_datadir}/llvm/cmake/Modules \
|
||||||
-DLLVM_DIR=%{_libdir}/cmake/llvm \
|
-DLLVM_DIR=%{_libdir}/cmake/llvm \
|
||||||
-DCMAKE_INSTALL_INCLUDEDIR=%{_libdir}/clang/%{maj_ver}/include \
|
-DCMAKE_INSTALL_INCLUDEDIR=%{_prefix}/lib/clang/%{maj_ver}/include \
|
||||||
%if 0%{?__isa_bits} == 64
|
%if 0%{?__isa_bits} == 64
|
||||||
-DOPENMP_LIBDIR_SUFFIX=64 \
|
-DOPENMP_LIBDIR_SUFFIX=64 \
|
||||||
%else
|
%else
|
||||||
-DOPENMP_LIBDIR_SUFFIX= \
|
-DOPENMP_LIBDIR_SUFFIX= \
|
||||||
|
%endif
|
||||||
|
%if %{with snapshot_build}
|
||||||
|
-DLLVM_VERSION_SUFFIX="%{llvm_snapshot_version_suffix}" \
|
||||||
%endif
|
%endif
|
||||||
-DCMAKE_SKIP_RPATH:BOOL=ON
|
-DCMAKE_SKIP_RPATH:BOOL=ON
|
||||||
|
|
||||||
@ -119,45 +114,12 @@ cd %{_vpath_builddir}
|
|||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
cd %{_vpath_builddir}
|
|
||||||
%cmake_install
|
%cmake_install
|
||||||
|
|
||||||
%if %{with testpkg}
|
|
||||||
# Test package setup
|
|
||||||
%global libomp_srcdir %{_datadir}/libomp/src/
|
|
||||||
%global libomp_testdir %{libomp_srcdir}/runtime/test/
|
|
||||||
%global lit_cfg %{libomp_testdir}/%{_arch}.site.cfg.py
|
|
||||||
%global lit_fedora_cfg %{_datadir}/libomp/lit.fedora.cfg.py
|
|
||||||
|
|
||||||
# Install test files
|
|
||||||
cd ..
|
|
||||||
install -d %{buildroot}%{libomp_srcdir}/runtime
|
|
||||||
cp -R runtime/test %{buildroot}%{libomp_srcdir}/runtime
|
|
||||||
cp -R runtime/src %{buildroot}%{libomp_srcdir}/runtime
|
|
||||||
|
|
||||||
cd %{_vpath_builddir}
|
|
||||||
# Generate lit config files. Strip off the last line that initiates the
|
|
||||||
# test run, so we can customize the configuration.
|
|
||||||
head -n -1 runtime/test/lit.site.cfg >> %{buildroot}%{lit_cfg}
|
|
||||||
|
|
||||||
# Install custom fedora config file
|
|
||||||
cp %{SOURCE4} %{buildroot}%{lit_fedora_cfg}
|
|
||||||
|
|
||||||
# Patch lit config files to load custom fedora config
|
|
||||||
echo "lit_config.load_config(config, '%{lit_fedora_cfg}')" >> %{buildroot}%{lit_cfg}
|
|
||||||
|
|
||||||
# Install test script
|
|
||||||
install -d %{buildroot}%{_libexecdir}/tests/libomp
|
|
||||||
install -m 0755 %{SOURCE3} %{buildroot}%{_libexecdir}/tests/libomp
|
|
||||||
|
|
||||||
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Remove static libraries with equivalent shared libraries
|
# Remove static libraries with equivalent shared libraries
|
||||||
rm -rf %{buildroot}%{_libdir}/libarcher_static.a
|
rm -rf %{buildroot}%{_libdir}/libarcher_static.a
|
||||||
|
|
||||||
%check
|
%check
|
||||||
cd %{_vpath_builddir}
|
|
||||||
%cmake_build --target check-openmp || true
|
%cmake_build --target check-openmp || true
|
||||||
|
|
||||||
%files
|
%files
|
||||||
@ -169,44 +131,38 @@ cd %{_vpath_builddir}
|
|||||||
%endif
|
%endif
|
||||||
%ifnarch %{ix86} %{arm}
|
%ifnarch %{ix86} %{arm}
|
||||||
# libomptarget is not supported on 32-bit systems.
|
# libomptarget is not supported on 32-bit systems.
|
||||||
%{_libdir}/libomptarget.rtl.amdgpu.so.%{maj_ver}
|
%{_libdir}/libomptarget.rtl.amdgpu.so.%{so_suffix}
|
||||||
%{_libdir}/libomptarget.rtl.amdgpu.nextgen.so.%{maj_ver}
|
%{_libdir}/libomptarget.rtl.cuda.so.%{so_suffix}
|
||||||
%{_libdir}/libomptarget.rtl.cuda.so.%{maj_ver}
|
%{_libdir}/libomptarget.rtl.%{libomp_arch}.so.%{so_suffix}
|
||||||
%{_libdir}/libomptarget.rtl.cuda.nextgen.so.%{maj_ver}
|
%{_libdir}/libomptarget.so.%{so_suffix}
|
||||||
%{_libdir}/libomptarget.rtl.%{libomp_arch}.so.%{maj_ver}
|
|
||||||
%{_libdir}/libomptarget.rtl.%{libomp_arch}.nextgen.so.%{maj_ver}
|
|
||||||
%{_libdir}/libomptarget.so.%{maj_ver}
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_libdir}/clang/%{maj_ver}/include/omp.h
|
%{_prefix}/lib/clang/%{maj_ver}/include/omp.h
|
||||||
%{_libdir}/cmake/openmp/FindOpenMPTarget.cmake
|
|
||||||
%ifnarch %{arm}
|
%ifnarch %{arm}
|
||||||
%{_libdir}/clang/%{maj_ver}/include/omp-tools.h
|
%{_prefix}/lib/clang/%{maj_ver}/include/omp-tools.h
|
||||||
%{_libdir}/clang/%{maj_ver}/include/ompt.h
|
%{_prefix}/lib/clang/%{maj_ver}/include/ompt.h
|
||||||
%{_libdir}/clang/%{maj_ver}/include/ompt-multiplex.h
|
%{_prefix}/lib/clang/%{maj_ver}/include/ompt-multiplex.h
|
||||||
%endif
|
%endif
|
||||||
|
%{_libdir}/cmake/openmp/FindOpenMPTarget.cmake
|
||||||
%ifnarch %{ix86} %{arm}
|
%ifnarch %{ix86} %{arm}
|
||||||
# libomptarget is not supported on 32-bit systems.
|
# libomptarget is not supported on 32-bit systems.
|
||||||
%{_libdir}/libomptarget.rtl.amdgpu.so
|
%{_libdir}/libomptarget.rtl.amdgpu.so
|
||||||
%{_libdir}/libomptarget.rtl.amdgpu.nextgen.so
|
|
||||||
%{_libdir}/libomptarget.rtl.cuda.so
|
%{_libdir}/libomptarget.rtl.cuda.so
|
||||||
%{_libdir}/libomptarget.rtl.cuda.nextgen.so
|
|
||||||
%{_libdir}/libomptarget.rtl.%{libomp_arch}.so
|
%{_libdir}/libomptarget.rtl.%{libomp_arch}.so
|
||||||
%{_libdir}/libomptarget.rtl.%{libomp_arch}.nextgen.so
|
|
||||||
%{_libdir}/libomptarget.devicertl.a
|
%{_libdir}/libomptarget.devicertl.a
|
||||||
%{_libdir}/libomptarget-amdgpu-*.bc
|
%{_libdir}/libomptarget-amdgpu-*.bc
|
||||||
%{_libdir}/libomptarget-nvptx-*.bc
|
%{_libdir}/libomptarget-nvptx-*.bc
|
||||||
%{_libdir}/libomptarget.so
|
%{_libdir}/libomptarget.so
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with testpkg}
|
|
||||||
%files test
|
|
||||||
%{_datadir}/libomp
|
|
||||||
%{_libexecdir}/tests/libomp/
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 29 2023 Nikita Popov <npopov@redhat.com> - 17.0.6-1
|
||||||
|
- Update to LLVM 17.0.6
|
||||||
|
|
||||||
|
* Wed Oct 04 2023 Nikita Popov <npopov@redhat.com> - 17.0.2-1
|
||||||
|
- Update to LLVM 17.0.2
|
||||||
|
|
||||||
* Sat Jul 15 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-3
|
* Sat Jul 15 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-3
|
||||||
- Remove duplicated installed binaries
|
- Remove duplicated installed binaries
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user