SPECS/libomp.spec

@@ -5,8 +5,6 @@
 %{llvm_sb}
 %endif
 
-%global toolchain gcc
-
 %global maj_ver 17
 %global libomp_version %{maj_ver}.0.6
 #global rc_ver 4
@@ -20,7 +18,6 @@
 %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
@@ -32,11 +29,11 @@
 %endif
 
 Name: libomp
-Version: %{libomp_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
+Version: %{libomp_version}%{?rc_ver:~rc%{rc_ver}}
 Release: 1%{?dist}
 Summary: OpenMP runtime for clang
 
-License: Apache-2.0 WITH LLVM-exception OR NCSA
+License: NCSA
 URL: http://openmp.llvm.org
 %if %{with snapshot_build}
 Source0: %{llvm_snapshot_source_prefix}openmp-%{llvm_snapshot_yyyymmdd}.src.tar.xz
@@ -57,6 +54,8 @@ BuildRequires: perl
 BuildRequires: perl-Data-Dumper
 BuildRequires: perl-Encode
 BuildRequires: libffi-devel
+# RHEL specific: libomp requires libterminfo
+BuildRequires: ncurses-devel
 
 # For gpg source verification
 BuildRequires:	gnupg2
@@ -67,7 +66,7 @@ BuildRequires: llvm-cmake-utils
 
 Requires: elfutils-libelf%{?isa}
 
-Obsoletes: libomp-test < 17.0.2
+Obsoletes: libomp-test < 17.0.3
 
 # libomp does not support s390x.
 ExcludeArch: s390x
@@ -90,12 +89,13 @@ OpenMP header files.
 %autosetup -n %{libomp_srcdir} -p2
 
 %build
+%undefine __cmake_in_source_build
 
-%if "%toolchain" == "gcc"
+# LTO causes build failures in this package.  Disable LTO for now
-# Building openmp with LTO fails with GCC but works with Clang
+# https://bugzilla.redhat.com/show_bug.cgi?id=1988155
 %define _lto_cflags %{nil}
-%endif
+
-%cmake	-GNinja \
+%cmake -GNinja \
 	-DLIBOMP_INSTALL_ALIASES=OFF \
 	-DCMAKE_MODULE_PATH=%{_datadir}/llvm/cmake/Modules \
 	-DLLVM_DIR=%{_libdir}/cmake/llvm \
@@ -120,7 +120,7 @@ OpenMP header files.
 rm -rf %{buildroot}%{_libdir}/libarcher_static.a
 
 %check
-%cmake_build --target check-openmp
+%cmake_build --target check-openmp || true
 
 %files
 %license LICENSE.TXT
@@ -157,252 +157,120 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
 %endif
 
 %changelog
-%{?llvm_snapshot_changelog_entry}
+* Wed Nov 29 2023 Nikita Popov <npopov@redhat.com> - 17.0.6-1
+- Update to LLVM 17.0.6
 
-* Mon Dec 11 2023 Timm Bäder <tbaeder@redhat.com> - 17.0.6-1
+* Wed Oct 04 2023 Nikita Popov <npopov@redhat.com> - 17.0.2-1
-- Update to 17.0.6
+- Update to LLVM 17.0.2
 
-* Fri Oct 20 2023 Timm Bäder <tbaeder@redhat.com> - 17.0.1-2
+* Sat Jul 15 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-3
-- Add obsoletes for libomp-test package.
+- Remove duplicated installed binaries
 
-* Fri Sep 29 2023 Timm Bäder <tbaeder@redhat.com> - 17.0.1-1
+* Wed Jul 05 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-2
-- Update to 17.0.1
+- Add explict libomp requres to libomp-devel
 
-* Wed Jul 05 2023 Nikita Popov <npopov@redhat.com> - 16.0.6-1
+* Fri Jun 23 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-1
-- Update to LLVM 16.0.6
+- 16.0.6 Release
 
-* Wed Apr 19 2023 Nikita Popov <npopov@redhat.com> - 16.0.1-1
+* Fri Apr 28 2023 Tom Stellard <tstellar@redhat.com> - 16.0.0-1
-- Update to LLVM 16.0.1
+- Release 16.0.0
 
-* Mon Jan 16 2023 Konrad Kleine <kkleine@redhat.com> - 15.0.7-1
+* Thu Jan 19 2023 Tom Stellard <tstellar@redhat.com> - 15.0.7-1
 - Update to LLVM 15.0.7
 
-* Fri Dec 09 2022 Konrad Kleine <kkleine@redhat.com> - 15.0.6-1
+* Tue Sep 06 2022 Nikita Popov <npopov@redhat.com> - 15.0.0-1
-- 15.0.6 Release
+- Update to LLVM 15.0.0
 
-* Fri Oct 28 2022 Konrad Kleine <kkleine@redhat.com> - 15.0.1-2
+* Wed Aug 10 2022 Tom Stellard <tstellar@redhat.com> - 14.0.6-2
-- Build libomp runtime library with gcc
+- Drop -test sub-package on i686
 
-* Thu Sep 29 2022 Konrad Kleine <kkleine@redhat.com> - 15.0.1-1
+* Tue Jun 28 2022 Tom Stellard <tstellar@redhat.com> - 14.0.6-1
-- 15.0.1 Release
-
-* Wed Jul 20 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.6-1
 - 14.0.6 Release
 
-* Tue Jun 21 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.5-1
+* Wed May 18 2022 Timm Bäder <tbaeder@redhat.com> - 14.00-2
-- 14.0.5 Release
+- Backport 40d3a0ba4d9e5452c0a68cfdaa8e88eb8ed5c63d to
+  fix a strict aliasing issue.
 
-* Mon Apr 25 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-1
+* Thu Apr 07 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-1
-- 14.0.0 Release
+- Update to 14.0.0
 
 * Thu Feb 03 2022 Tom Stellard <tstellar@redhat.com> - 13.0.1-1
 - 13.0.1 Release
 
-* Tue Oct 12 2021 Timm Bäder <tbaeder@redhat.com> 13.0.0-1
+* Fri Oct 15 2021 Tom Stellard <tstellar@redhat.com> - 13.0.0-1
-- Release 13.0.0
+- 13.0.0 Release
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 12.0.1-2
+* Fri Jul 16 2021 sguelton@redhat.com - 12.0.1-1
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- 12.0.1 release
-  Related: rhbz#1991688
 
-* Tue Jul 13 2021 Tom Stellard <tstellar@redhat.com> - 12.0.1-1
+* Thu May 6 2021 sguelton@redhat.com - 12.0.0-1
-- 12.0.1 Release
+- 12.0.0 release
 
-* Fri Apr 16 2021 Tom Stellard <tstellar@redhat.com> - 12.0.0-1
+* Thu Oct 29 2020 sguelton@redhat.com - 11.0.0-1
-- 12.0.0 Release
+- 11.0.0 final release
 
-* Thu Apr 08 2021 sguelton@redhat.com - 12.0.0-0.7.rc5
+* Mon Sep 21 2020 sguelton@redhat.com - 11.0.0-0.1.rc2
-- New upstream release candidate
-
-* Fri Apr 02 2021 sguelton@redhat.com - 12.0.0-0.6.rc4
-- New upstream release candidate
-
-* Wed Mar 31 2021 Jonathan Wakely <jwakely@redhat.com> - 12.0.0-0.5.rc3
-- Rebuilt for removed libstdc++ symbols (#1937698)
-
-* Thu Mar 11 2021 sguelton@redhat.com - 12.0.0-0.4.rc3
-- LLVM 12.0.0 rc3
-
-* Tue Mar 09 2021 sguelton@redhat.com - 12.0.0-0.3.rc2
-- rebuilt
-
-* Wed Feb 24 2021 sguelton@redhat.com - 12.0.0-0.2.rc2
-- 12.0.0-rc2 release
-
-* Mon Feb 22 2021 sguelton@redhat.com - 12.0.0-0.1.rc1
-- 12.0.0-rc1 release
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 11.1.0-0.3.rc2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jan 22 2021 Serge Guelton - 11.1.0-0.2.rc2
-- llvm 11.1.0-rc2 release
-
-* Thu Jan 14 2021 Serge Guelton - 11.1.0-0.1.rc1
-- 11.1.0-rc1 release
-
-* Wed Jan 06 2021 Serge Guelton - 11.0.1-3
-- LLVM 11.0.1 final
-
-* Tue Dec 22 2020 sguelton@redhat.com - 11.0.1-2.rc2
-- llvm 11.0.1-rc2
-
-* Tue Dec 01 2020 sguelton@redhat.com - 11.0.1-1.rc1
-- llvm 11.0.1-rc1
-
-* Wed Oct 28 2020 Tom Stellard <tstellar@redhat.com> - 11.0.0-2
-- Replace clang-devel dependency with clang-resource-filesystem
-
-* Thu Oct 15 2020 sguelton@redhat.com - 11.0.0-1
-- Fix NVR
-
-* Mon Oct 12 2020 sguelton@redhat.com - 11.0.0-0.5
-- llvm 11.0.0 - final release
-
-* Thu Oct 08 2020 sguelton@redhat.com - 11.0.0-0.4.rc6
-- 11.0.0-rc6
-
-* Fri Oct 02 2020 sguelton@redhat.com - 11.0.0-0.3.rc5
-- 11.0.0-rc5 Release
-
-* Sun Sep 27 2020 sguelton@redhat.com - 11.0.0-0.2.rc3
-- Fix NVR
-
-* Thu Sep 24 2020 sguelton@redhat.com - 11.0.0-0.1.rc3
-- 11.0.0-rc3 Release
-
-* Tue Sep 01 2020 sguelton@redhat.com - 11.0.0-0.1.rc2
 - 11.0.0-rc2 Release
 
-* Mon Aug 10 2020 Tom Stellard <tstellar@redhat.com> - 11.0.0-0.1.rc1
+* Fri Jul 24 2020 sguelton@redhat.com - 10.0.1-1
-- 11.0.0-rc1 Release
+- 10.0.1 final
 
-* Mon Aug 10 2020 sguelton@redhat.com - 10.0.0-8
+* Mon Jun 15 2020 sguelton@redhat.com - 10.0.0-2
-- Make gcc dependency explicit, see https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B#BuildRequires_and_Requires
+- Better dependency specification, see rhbz#1841180
-- use %%license macro
 
-* Sat Aug 08 2020 Jeff Law <releng@fedoraproject.org> - 10.0.0-7
+* Thu Apr 9 2020 sguelton@redhat.com - 10.0.0-1
-- Disable LTO for now
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.0-6
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 20 2020 sguelton@redhat.com - 10.0.0-4
-- Use modern cmake macro
-- Use gnupg verify
-
-* Tue Jun 16 2020 sguelton@redhat.com - 10.0.0-3
-- Add Requires: libomp = %%{version}-%%{release} to libomp-test to avoid
-  the need to test interoperability between the various combinations of old
-  and new subpackages.
-
-* Mon Jun 01 2020 sguelton@redhat.com - 10.0.0-2
-- Add Requires: libomp-devel = %%{version}-%%{release} to libomp-test to avoid
-  the need to test interoperability between the various combinations of old
-  and new subpackages.
-
-* Mon Mar 30 2020 sguelton@redhat.com - 10.0.0-1
 - 10.0.0 final
 
-* Wed Mar 25 2020 sguelton@redhat.com - 10.0.0-0.6.rc6
-- 10.0.0 rc6
-
-* Fri Mar 20 2020 sguelton@redhat.com - 10.0.0-0.5.rc5
-- 10.0.0 rc5
-
-* Sun Mar 15 2020 sguelton@redhat.com - 10.0.0-0.4.rc4
-- 10.0.0 rc4
-
-* Thu Mar 05 2020 sguelton@redhat.com - 10.0.0-0.3.rc3
-- 10.0.0 rc3
-
-* Fri Feb 14 2020 sguelton@redhat.com - 10.0.0-0.2.rc2
-- 10.0.0 rc2
-
-* Fri Jan 31 2020 sguelton@redhat.com - 10.0.0-0.1.rc1
-- 10.0.0 rc1
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Thu Dec 19 2019 Tom Stellard <tstellar@redhat.com> - 9.0.1-1
 - 9.0.1 Release
 
-* Thu Sep 19 2019 Tom Stellard <tstellar@redhat.com> - 9.0.0-1
+* Fri Sep 27 2019 Tom Stellard <tstellar@redhat.com> - 9.0.0-1
 - 9.0.0 Release
 
-* Thu Aug 22 2019 Tom Stellard <tstellar@redhat.com> - 9.0.0-0.1.rc3
+* Thu Aug 1 2019 sguelton@redhat.com - 8.0.1-1
-- 9.0.0-rc3 Release
+- 8.0.1 release
 
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.0-2.1
+* Thu Jun 13 2019 sguelton@redhat.com - 8.0.1-0.1.rc2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+- 8.0.1rc2 Release
 
-* Thu Apr 25 2019 Tom Stellard <tstellar@redhat.com> - 8.0.0-2
+* Mon Apr 29 2019 sguelton@redhat.com - 8.0.0-1
-- Simplify libomp-test package
+- 8.0.0 Release
 
-* Wed Mar 20 2019 sguelton@redhat.com - 8.0.0-1
+* Fri Dec 14 2018 Tom Stellard <tstellar@redhat.com> - 7.0.1-1
-- 8.0.0 final
-
-* Tue Mar 12 2019 sguelton@redhat.com - 8.0.0-0.3.rc4
-- 8.0.0 Release candidate 4
-
-* Mon Feb 11 2019 sguelton@redhat.com - 8.0.0-0.2.rc2
-- 8.0.0 Release candidate 2
-
-* Mon Feb 11 2019 sguelton@redhat.com - 8.0.0-0.1.rc1
-- 8.0.0 Release candidate 1
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.1-1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Dec 17 2018 sguelton@redhat.com - 7.0.1-1
 - 7.0.1 Release
 
-* Wed Sep 12 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-1
+* Wed Dec 12 2018 Tom Stellard <tstellar@redhat.com> - 7.0.1-0.2.rc3
-- 7.0.1 Release
+- Fix test failures on single-core systems
 
-* Wed Sep 12 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.2.rc3
+* Mon Dec 10 2018 Tom Stellard <tstellar@redhat.com> - 7.0.1-0.1.rc3
-- 7.0.0-rc3 Release
+- 7.0.1-rc3 Release
 
-* Tue Aug 14 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.1.rc1
+* Tue Nov 27 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-1
-- 7.0.1-rc1 Release
+- 7.0.0 Release
 
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.1-3
+* Sat Nov 10 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+- Don't build libomp-test on i686
 
-* Mon Jul 02 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-2
+* Mon Oct 01 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-2
-- Add -threads option to runtest.sh
+- Drop scl macros
 
-* Thu Jun 28 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-1
+* Wed Jul 11 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-1
 - 6.0.1 Release
 
-* Fri May 11 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-0.1.rc1
+* Mon Jan 15 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-2
-- 6.0.1-rc1 Release
+- Drop ExcludeArch: ppc64
-
-* Wed Mar 28 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-3
-- Add test package
-
-* Wed Mar 28 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-2
-- Enable libomptarget plugins
-
-* Fri Mar 09 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-1
-- 6.0.0 Release
-
-* Tue Feb 13 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-0.3.rc2
-- 6.0.0-rc2 Release
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-0.2.rc1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jan 25 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-0.1.rc1
-- 6.0.0-rc1 Release
 
 * Thu Dec 21 2017 Tom Stellard <tstellar@redhat.com> - 5.0.1-1
 - 5.0.1 Release.
 
-* Mon May 15 2017 Tom Stellard <tstellar@redhat.com> - 5.0.0-1
+* Wed Jun 21 2017 Tom Stellard <tstellar@redhat.com> - 4.0.1-1
+- 4.0.1 Release.
+
+* Wed Jun 07 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-3
+- Rename libopenmp->libomp
+
+* Fri May 26 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-2
+- Disable build on s390x
+
+* Mon May 15 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-1
 - Initial version.