Compare commits
3 Commits
| Author | SHA1 | Date |
|---|---|---|
Troy Dawson
|
9fafb0d05a | |
Rich Mattes
|
4fc1838199 | |
Gwyn Ciesla
|
e175b9f263 |
|
|
@ -1,7 +1,3 @@
|
|||
/abseil-cpp-20200225.2.tar.gz
|
||||
/abseil-cpp-20200923.2.tar.gz
|
||||
/abseil-cpp-20200923.3.tar.gz
|
||||
/abseil-cpp-20210324.2.tar.gz
|
||||
/abseil-cpp-20211102.0.tar.gz
|
||||
/abseil-cpp-20220623.0.tar.gz
|
||||
/abseil-cpp-20220623.1.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
From 09e96049995584c3489e4bd1467313e3e85af99c Mon Sep 17 00:00:00 2001
|
||||
From: Bruno Pitrus <brunopitrus@hotmail.com>
|
||||
Date: Mon, 11 Jul 2022 18:27:39 +0200
|
||||
Subject: [PATCH] Do not leak -maes -msse4.1 into pkgconfig
|
||||
|
||||
---
|
||||
CMake/AbseilHelpers.cmake | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake
|
||||
index ebe9ddc87..9cd87c513 100644
|
||||
--- a/CMake/AbseilHelpers.cmake
|
||||
+++ b/CMake/AbseilHelpers.cmake
|
||||
@@ -166,6 +166,8 @@ function(absl_cc_library)
|
||||
set(PC_CFLAGS "${PC_CFLAGS} ${cflag}")
|
||||
elseif(${cflag} MATCHES "^(-W|/w[1234eo])")
|
||||
# Don't impose our warnings on others.
|
||||
+ elseif(${cflag} MATCHES "^-m")
|
||||
+ # Don't impose CPU instruction requirements on others, as the code performs feature detection on runtime.
|
||||
else()
|
||||
set(PC_CFLAGS "${PC_CFLAGS} ${cflag}")
|
||||
endif()
|
||||
|
|
@ -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<decltype(SIGSTKSZ)>(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.
|
||||
100
abseil-cpp.spec
100
abseil-cpp.spec
|
|
@ -1,48 +1,20 @@
|
|||
# Installed library version
|
||||
%global lib_version 2206.0.0
|
||||
# Force out of source build
|
||||
%undefine __cmake_in_source_build
|
||||
|
||||
Name: abseil-cpp
|
||||
Version: 20220623.1
|
||||
Release: 2%{?dist}
|
||||
Version: 20200923.3
|
||||
Release: 1%{?dist}
|
||||
Summary: C++ Common Libraries
|
||||
|
||||
# The entire source is Apache-2.0, except:
|
||||
# - The following files are LicenseRef-Fedora-Public-Domain:
|
||||
# absl/time/internal/cctz/src/tzfile.h
|
||||
# ** This file is in the public domain, so clarified as of
|
||||
# ** 1996-06-05 by Arthur David Olson.
|
||||
# absl/time/internal/cctz/testdata/zoneinfo/iso3166.tab
|
||||
# # This file is in the public domain, so clarified as of
|
||||
# # 2009-05-17 by Arthur David Olson.
|
||||
# absl/time/internal/cctz/testdata/zoneinfo/zone1970.tab
|
||||
# # This file is in the public domain.
|
||||
License: Apache-2.0 AND LicenseRef-Fedora-Public-Domain
|
||||
License: ASL 2.0
|
||||
URL: https://abseil.io
|
||||
Source0: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
# Backport upstream commit 09e96049995584c3489e4bd1467313e3e85af99c, which
|
||||
# corresponds to:
|
||||
#
|
||||
# Do not leak -maes -msse4.1 into pkgconfig
|
||||
# https://github.com/abseil/abseil-cpp/pull/1216
|
||||
#
|
||||
# Fixes RHBZ#2108658.
|
||||
Patch: https://github.com/abseil/abseil-cpp/commit/09e96049995584c3489e4bd1467313e3e85af99c.patch
|
||||
Patch0: abseil-cpp-20200923.3-typematch.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
# The default make backend would work just as well; ninja is observably faster
|
||||
BuildRequires: ninja-build
|
||||
BuildRequires: gcc-c++
|
||||
|
||||
BuildRequires: gmock-devel
|
||||
BuildRequires: gtest-devel
|
||||
|
||||
%ifarch s390x
|
||||
# Symbolize.SymbolizeWithMultipleMaps fails in absl_symbolize_test on s390x
|
||||
# with LTO
|
||||
# https://github.com/abseil/abseil-cpp/issues/1133
|
||||
%global _lto_cflags %{nil}
|
||||
%endif
|
||||
BuildRequires: make
|
||||
|
||||
%description
|
||||
Abseil is an open-source collection of C++ library code designed to augment
|
||||
|
|
@ -67,76 +39,28 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||
Development headers for %{name}
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -S gendiff
|
||||
%autosetup -p1
|
||||
|
||||
|
||||
%build
|
||||
%cmake \
|
||||
-GNinja \
|
||||
-DABSL_USE_EXTERNAL_GOOGLETEST:BOOL=ON \
|
||||
-DABSL_FIND_GOOGLETEST:BOOL=ON \
|
||||
-DABSL_ENABLE_INSTALL:BOOL=ON \
|
||||
-DABSL_BUILD_TESTING:BOOL=ON \
|
||||
-DCMAKE_BUILD_TYPE:STRING=None \
|
||||
-DCMAKE_CXX_STANDARD:STRING=17
|
||||
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
%cmake_build
|
||||
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
|
||||
%check
|
||||
%ctest
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc FAQ.md README.md UPGRADES.md
|
||||
%{_libdir}/libabsl_*.so.%{lib_version}
|
||||
%doc FAQ.md LTS.md README.md UPGRADES.md
|
||||
%{_libdir}/libabsl_*.so
|
||||
|
||||
%files devel
|
||||
%{_includedir}/absl
|
||||
%{_libdir}/libabsl_*.so
|
||||
%{_libdir}/cmake/absl
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
|
||||
%changelog
|
||||
* Fri Sep 02 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20220623.1-2
|
||||
- Update to 20220623.1 (close RHBZ#2123181)
|
||||
|
||||
* Sat Aug 13 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20220623.0-1
|
||||
- Update to 20220623.0 (close RHBZ#2101021)
|
||||
- Update License to SPDX
|
||||
|
||||
* Fri Jul 29 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20211102.0-4
|
||||
- Do not leak -maes -msse4.1 into pkgconfig (fix RHBZ#2108658)
|
||||
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20211102.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Tue Mar 15 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20211102.0-2
|
||||
- Disable LTO on s390x to work around test failure
|
||||
- Skip SysinfoTest.NominalCPUFrequency on all architectures; it fails
|
||||
occasionally on aarch64, and upstream says we should not care
|
||||
|
||||
* Fri Feb 18 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20211102.0-1
|
||||
- Update to 20211102.0 (close RHBZ#2019691)
|
||||
- Drop --output-on-failure, already in %%ctest expansion
|
||||
- On s390x, instead of ignoring all tests, skip only the single failing test
|
||||
- Use ninja backend for CMake: speeds up build with no downsides
|
||||
- Drop patch for armv7hl
|
||||
|
||||
* Mon Jan 31 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20210324.2-4
|
||||
- Fix test failure (fix RHBZ#2045186)
|
||||
|
||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20210324.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20210324.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri May 21 2021 Rich Mattes <richmattes@gmail.com> - 20210324.1-2
|
||||
- Update to release 20210324.2
|
||||
- Enable and run test suite
|
||||
|
||||
* Mon Mar 08 2021 Rich Mattes <richmattes@gmail.com> - 20200923.3-1
|
||||
- Update to release 20200923.3
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (abseil-cpp-20220623.1.tar.gz) = ab4fccd9a2bfa0c5ad4b56c8e8f8b7ec7a8eca8b6cc6959802acadd1da785e1feb078c6ac621808cd699c82717a9e637dc426d94b70a8db7f2a807059d41cbc2
|
||||
SHA512 (abseil-cpp-20200923.3.tar.gz) = 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85
|
||||
|
|
|
|||
Loading…
Reference in New Issue