From a5ac5b821deb0f965554b3836aecef9ab0ef4f83 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Sat, 27 Jun 2020 23:57:28 -0400 Subject: [PATCH 01/11] Initial import --- .gitignore | 1 + abseil-cpp.spec | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 64 insertions(+) create mode 100644 .gitignore create mode 100644 abseil-cpp.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fa909c5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/abseil-cpp-20200225.2.tar.gz diff --git a/abseil-cpp.spec b/abseil-cpp.spec new file mode 100644 index 0000000..4b26a9f --- /dev/null +++ b/abseil-cpp.spec @@ -0,0 +1,62 @@ +Name: abseil-cpp +Version: 20200225.2 +Release: 2%{?dist} +Summary: C++ Common Libraries + +License: ASL 2.0 +URL: https://abseil.io +Source0: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz + +BuildRequires: cmake +BuildRequires: gcc-c++ + +%description +Abseil is an open-source collection of C++ library code designed to augment +the C++ standard library. The Abseil library code is collected from +Google's own C++ code base, has been extensively tested and used in +production, and is the same code we depend on in our daily coding lives. + +In some cases, Abseil provides pieces missing from the C++ standard; in +others, Abseil provides alternatives to the standard for special needs we've +found through usage in the Google code base. We denote those cases clearly +within the library code we provide you. + +Abseil is not meant to be a competitor to the standard library; we've just +found that many of these utilities serve a purpose within our code base, +and we now want to provide those resources to the C++ community as a whole. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +Development headers for %{name} + +%prep +%autosetup + + +%build +%cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo +%make_build + + +%install +%make_install + + +%files +%license LICENSE +%doc FAQ.md LTS.md README.md UPGRADES.md +%{_libdir}/libabsl_*.so + +%files devel +%{_includedir}/absl +%{_libdir}/cmake/absl + +%changelog +* Wed May 27 2020 Rich Mattes - 20200225.2-2 +- Don't remove buildroot in install + +* Sun May 24 2020 Rich Mattes - 20200225.2-1 +- Initial package. diff --git a/sources b/sources new file mode 100644 index 0000000..3e1be23 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (abseil-cpp-20200225.2.tar.gz) = 75a607dee825e83c10dcd5e509515461f1b12c4aca861e4739ac4d41357b8e893dbfbe33873aa5c05463dde0891dedd7535af2ec59f173de29488e1b1321b335 From 63c98b46c65df3725c7f24f1ac379c1cbd6623f9 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 5 Jul 2020 14:04:05 -0400 Subject: [PATCH 02/11] Update to new out-of-source build mechanism --- abseil-cpp.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/abseil-cpp.spec b/abseil-cpp.spec index 4b26a9f..f55c27d 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -1,3 +1,6 @@ +# Force out of source build +%undefine __cmake_in_source_build + Name: abseil-cpp Version: 20200225.2 Release: 2%{?dist} @@ -37,12 +40,12 @@ Development headers for %{name} %build -%cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -%make_build +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo +%cmake_build %install -%make_install +%cmake_install %files From 71cf974bd71e2254498ad5397494416ca4bfc05c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:41:11 +0000 Subject: [PATCH 03/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abseil-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abseil-cpp.spec b/abseil-cpp.spec index f55c27d..78de898 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -3,7 +3,7 @@ Name: abseil-cpp Version: 20200225.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ Common Libraries License: ASL 2.0 @@ -58,6 +58,9 @@ Development headers for %{name} %{_libdir}/cmake/absl %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 20200225.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed May 27 2020 Rich Mattes - 20200225.2-2 - Don't remove buildroot in install From 0c16b9ef7f2dacb04b51c7d0e8e8e8b7314bf682 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:47:30 +0000 Subject: [PATCH 04/11] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abseil-cpp.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/abseil-cpp.spec b/abseil-cpp.spec index 78de898..019de77 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -3,7 +3,7 @@ Name: abseil-cpp Version: 20200225.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ Common Libraries License: ASL 2.0 @@ -58,6 +58,10 @@ Development headers for %{name} %{_libdir}/cmake/absl %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 20200225.2-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 20200225.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7a492a8f08059819b5720c1a8b410e5c92d73aaf Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Sat, 19 Dec 2020 11:30:07 -0500 Subject: [PATCH 05/11] Update to release 20200923.2 Rebuild to fix tagging in koji (rhbz#1885561) --- abseil-cpp.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/abseil-cpp.spec b/abseil-cpp.spec index 019de77..493a99e 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -2,8 +2,8 @@ %undefine __cmake_in_source_build Name: abseil-cpp -Version: 20200225.2 -Release: 4%{?dist} +Version: 20200923.2 +Release: 1%{?dist} Summary: C++ Common Libraries License: ASL 2.0 @@ -58,6 +58,10 @@ Development headers for %{name} %{_libdir}/cmake/absl %changelog +* Sat Dec 19 2020 Rich Mattes - 20200923.2-1 +- Update to release 20200923.2 +- Rebuild to fix tagging in koji (rhbz#1885561) + * Fri Jul 31 2020 Fedora Release Engineering - 20200225.2-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From a9b87cd299921bf4ad48c21161e5d98c18ade310 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Sat, 19 Dec 2020 11:32:51 -0500 Subject: [PATCH 06/11] Add new sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fa909c5..1c8cceb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /abseil-cpp-20200225.2.tar.gz +/abseil-cpp-20200923.2.tar.gz diff --git a/sources b/sources index 3e1be23..cb13e03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abseil-cpp-20200225.2.tar.gz) = 75a607dee825e83c10dcd5e509515461f1b12c4aca861e4739ac4d41357b8e893dbfbe33873aa5c05463dde0891dedd7535af2ec59f173de29488e1b1321b335 +SHA512 (abseil-cpp-20200923.2.tar.gz) = fdbb0f84265bc1d4f24aac0af6d0eb8cb603f801fc14d63ac1e9d3bab47703a8a2ff5f44a0a4d325819dbea50fc533d967e1bfd65004ec11ef35fadc44a2b855 From cadfebbdb89aec59afeb52c4cb995d1ab7db0d23 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Sat, 19 Dec 2020 11:42:43 -0500 Subject: [PATCH 07/11] Add patch for missing limits header --- abseil-cpp-20200923.2.gcc11.patch | 11 +++++++++++ abseil-cpp.spec | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 abseil-cpp-20200923.2.gcc11.patch diff --git a/abseil-cpp-20200923.2.gcc11.patch b/abseil-cpp-20200923.2.gcc11.patch new file mode 100644 index 0000000..87bec85 --- /dev/null +++ b/abseil-cpp-20200923.2.gcc11.patch @@ -0,0 +1,11 @@ +diff -up ./absl/synchronization/internal/graphcycles.cc.gcc11 ./absl/synchronization/internal/graphcycles.cc +--- ./absl/synchronization/internal/graphcycles.cc.gcc11 2020-12-19 11:39:31.244272590 -0500 ++++ ./absl/synchronization/internal/graphcycles.cc 2020-12-19 11:39:53.069335816 -0500 +@@ -37,6 +37,7 @@ + + #include + #include ++#include + #include "absl/base/internal/hide_ptr.h" + #include "absl/base/internal/raw_logging.h" + #include "absl/base/internal/spinlock.h" diff --git a/abseil-cpp.spec b/abseil-cpp.spec index 493a99e..efb86e6 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -10,6 +10,9 @@ License: ASL 2.0 URL: https://abseil.io Source0: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz +# Explicitly include for std::numeric_limits +Patch0: %{name}-20200923.2.gcc11.patch + BuildRequires: cmake BuildRequires: gcc-c++ @@ -36,7 +39,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Development headers for %{name} %prep -%autosetup +%autosetup -p1 %build From 10bff2739f67e6277beb1a2d2cf59d5f12ffc9f6 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Sat, 19 Dec 2020 11:45:21 -0500 Subject: [PATCH 08/11] Add comment about new patch --- abseil-cpp.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/abseil-cpp.spec b/abseil-cpp.spec index efb86e6..6b6236d 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -11,6 +11,7 @@ URL: https://abseil.io Source0: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz # Explicitly include for std::numeric_limits +# Already addressed in upstream git. Patch0: %{name}-20200923.2.gcc11.patch BuildRequires: cmake From 892085923377a6aff7c216b08f14445e1c8ceaf0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:44:55 +0000 Subject: [PATCH 09/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abseil-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abseil-cpp.spec b/abseil-cpp.spec index 6b6236d..9c9f34b 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -3,7 +3,7 @@ Name: abseil-cpp Version: 20200923.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ Common Libraries License: ASL 2.0 @@ -62,6 +62,9 @@ Development headers for %{name} %{_libdir}/cmake/absl %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 20200923.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Dec 19 2020 Rich Mattes - 20200923.2-1 - Update to release 20200923.2 - Rebuild to fix tagging in koji (rhbz#1885561) From ea6a6244e254456005caae83a8421ab733343d1c Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Mon, 8 Mar 2021 20:33:21 -0500 Subject: [PATCH 10/11] Update to release 20200923.3 --- .gitignore | 1 + abseil-cpp-20200923.2.gcc11.patch | 11 ----------- abseil-cpp.spec | 11 +++++------ sources | 2 +- 4 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 abseil-cpp-20200923.2.gcc11.patch diff --git a/.gitignore b/.gitignore index 1c8cceb..1be5bc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /abseil-cpp-20200225.2.tar.gz /abseil-cpp-20200923.2.tar.gz +/abseil-cpp-20200923.3.tar.gz diff --git a/abseil-cpp-20200923.2.gcc11.patch b/abseil-cpp-20200923.2.gcc11.patch deleted file mode 100644 index 87bec85..0000000 --- a/abseil-cpp-20200923.2.gcc11.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up ./absl/synchronization/internal/graphcycles.cc.gcc11 ./absl/synchronization/internal/graphcycles.cc ---- ./absl/synchronization/internal/graphcycles.cc.gcc11 2020-12-19 11:39:31.244272590 -0500 -+++ ./absl/synchronization/internal/graphcycles.cc 2020-12-19 11:39:53.069335816 -0500 -@@ -37,6 +37,7 @@ - - #include - #include -+#include - #include "absl/base/internal/hide_ptr.h" - #include "absl/base/internal/raw_logging.h" - #include "absl/base/internal/spinlock.h" diff --git a/abseil-cpp.spec b/abseil-cpp.spec index 9c9f34b..e63dec1 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -2,18 +2,14 @@ %undefine __cmake_in_source_build Name: abseil-cpp -Version: 20200923.2 -Release: 2%{?dist} +Version: 20200923.3 +Release: 1%{?dist} Summary: C++ Common Libraries License: ASL 2.0 URL: https://abseil.io Source0: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz -# Explicitly include for std::numeric_limits -# Already addressed in upstream git. -Patch0: %{name}-20200923.2.gcc11.patch - BuildRequires: cmake BuildRequires: gcc-c++ @@ -62,6 +58,9 @@ Development headers for %{name} %{_libdir}/cmake/absl %changelog +* Mon Mar 08 2021 Rich Mattes - 20200923.3-1 +- Update to release 20200923.3 + * Mon Jan 25 2021 Fedora Release Engineering - 20200923.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index cb13e03..f256312 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abseil-cpp-20200923.2.tar.gz) = fdbb0f84265bc1d4f24aac0af6d0eb8cb603f801fc14d63ac1e9d3bab47703a8a2ff5f44a0a4d325819dbea50fc533d967e1bfd65004ec11ef35fadc44a2b855 +SHA512 (abseil-cpp-20200923.3.tar.gz) = 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85 From a8e7f942de8428277162346dccab9e88e1fecea9 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Mon, 8 Mar 2021 20:47:17 -0500 Subject: [PATCH 11/11] Add patch to match constant type for std::max --- abseil-cpp-20200923.3-typematch.patch | 12 ++++++++++++ abseil-cpp.spec | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 abseil-cpp-20200923.3-typematch.patch diff --git a/abseil-cpp-20200923.3-typematch.patch b/abseil-cpp-20200923.3-typematch.patch new file mode 100644 index 0000000..c7335c3 --- /dev/null +++ b/abseil-cpp-20200923.3-typematch.patch @@ -0,0 +1,12 @@ +diff -up ./absl/debugging/failure_signal_handler.cc.typematch ./absl/debugging/failure_signal_handler.cc +--- ./absl/debugging/failure_signal_handler.cc.typematch 2021-03-08 20:43:57.158396960 -0500 ++++ ./absl/debugging/failure_signal_handler.cc 2021-03-08 20:44:07.971430229 -0500 +@@ -135,7 +135,7 @@ static bool SetupAlternateStackOnce() { + #else + const size_t page_mask = sysconf(_SC_PAGESIZE) - 1; + #endif +- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; ++ size_t stack_size = (std::max(SIGSTKSZ, static_cast(65536)) + page_mask) & ~page_mask; + #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \ + defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER) + // Account for sanitizer instrumentation requiring additional stack space. diff --git a/abseil-cpp.spec b/abseil-cpp.spec index e63dec1..fc3cd66 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -10,8 +10,11 @@ License: ASL 2.0 URL: https://abseil.io Source0: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: abseil-cpp-20200923.3-typematch.patch + BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: make %description Abseil is an open-source collection of C++ library code designed to augment