Compare commits

...

No commits in common. 'c9' and 'c10-beta' have entirely different histories.
c9 ... c10-beta

2
.gitignore vendored

@ -1 +1 @@
SOURCES/snappy-1.1.8.tar.gz SOURCES/snappy-1.1.10.tar.gz

@ -1 +1 @@
1eeb144e7b564dd726136c97f869b453d2fb7924 SOURCES/snappy-1.1.8.tar.gz d3d2dae3cfd84115d218c70a92ee23a88c679057 SOURCES/snappy-1.1.10.tar.gz

@ -0,0 +1,14 @@
diff -Naur a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2021-05-04 15:53:34.000000000 -0700
+++ b/CMakeLists.txt 2021-07-08 15:07:15.382419910 -0700
@@ -76,10 +76,6 @@
# Disable C++ exceptions.
string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
-
- # Disable RTTI.
- string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make

@ -1,12 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -212,7 +212,7 @@
"snappy-test.cc"
)
target_compile_definitions(snappy_unittest PRIVATE -DHAVE_CONFIG_H)
- target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES})
+ target_link_libraries(snappy_unittest snappy ${GTEST_LIBRARIES} ${GFLAGS_LIBRARIES})
if(HAVE_LIBZ)
target_link_libraries(snappy_unittest z)

@ -0,0 +1,48 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -306,29 +306,12 @@
if(SNAPPY_BUILD_TESTS)
enable_testing()
- # Prevent overriding the parent project's compiler/linker settings on Windows.
- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
- set(install_gtest OFF)
- set(install_gmock OFF)
- set(build_gmock ON)
-
- # This project is tested using GoogleTest.
- add_subdirectory("third_party/googletest")
-
- # GoogleTest triggers a missing field initializers warning.
- if(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS)
- set_property(TARGET gtest
- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
- set_property(TARGET gmock
- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
- endif(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS)
-
add_executable(snappy_unittest "")
target_sources(snappy_unittest
PRIVATE
"snappy_unittest.cc"
)
- target_link_libraries(snappy_unittest snappy_test_support gmock_main gtest)
+ target_link_libraries(snappy_unittest snappy_test_support gtest_main gtest)
add_test(
NAME snappy_unittest
@@ -349,12 +332,11 @@
PRIVATE
"snappy_benchmark.cc"
)
- target_link_libraries(snappy_benchmark snappy_test_support benchmark_main)
+ target_link_libraries(snappy_benchmark snappy_test_support benchmark_main benchmark)
# This project uses Google benchmark for benchmarking.
set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "" FORCE)
set(BENCHMARK_ENABLE_EXCEPTIONS OFF CACHE BOOL "" FORCE)
- add_subdirectory("third_party/benchmark")
endif(SNAPPY_BUILD_BENCHMARKS)
if(SNAPPY_FUZZING_BUILD)

@ -1,19 +1,26 @@
# Drop gtest on RHEL
%bcond gtest %[ !0%{?rhel} ]
%global __cmake_in_source_build 1 %global __cmake_in_source_build 1
Name: snappy Name: snappy
Version: 1.1.8 Version: 1.1.10
Release: 8%{?dist} Release: 6%{?dist}
Summary: Fast compression and decompression library Summary: Fast compression and decompression library
License: BSD License: BSD-3-Clause
URL: https://github.com/google/snappy URL: https://github.com/google/snappy
Source0: https://github.com/google/snappy/releases/download/%{version}/%{name}-%{version}.tar.gz Source0: https://github.com/google/snappy/releases/download/%{version}/%{name}-%{version}.tar.gz
# add missing dependency on gtest to snappy_unittest # Remove dependency on bundled gtest and google-benchmark.
Patch0: %{name}-gtest.patch Patch0: %{name}-thirdparty.patch
# Do not forcibly disable RTTI
Patch1: %{name}-do-not-disable-rtti.patch
BuildRequires: make BuildRequires: make
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%{?with_gtest:BuildRequires: gtest-devel}
%description %description
Snappy is a compression/decompression library. It does not aim for maximum Snappy is a compression/decompression library. It does not aim for maximum
@ -36,11 +43,12 @@ developing applications that use %{name}.
%prep %prep
%setup -q %autosetup
%patch0 -p1
%build %build
%cmake . # gtest 1.13.0 requires C++14 or later
%cmake -DCMAKE_CXX_STANDARD=14 -DSNAPPY_BUILD_BENCHMARKS=OFF %{!?with_gtest:-DSNAPPY_BUILD_TESTS=OFF} .
%make_build %make_build
# create pkgconfig file # create pkgconfig file
@ -74,7 +82,8 @@ ctest -V %{?_smp_mflags}
%files %files
%doc AUTHORS COPYING NEWS README.md %license COPYING
%doc AUTHORS NEWS README.md
%{_libdir}/libsnappy.so.* %{_libdir}/libsnappy.so.*
%files devel %files devel
@ -86,15 +95,45 @@ ctest -V %{?_smp_mflags}
%changelog %changelog
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.8-8 * Tue Aug 13 2024 Tao Liu <ltao@redhat.com> - 1.1.10-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Remove build-dependency google-benchmark
Related: rhbz#1991688
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.1.10-5
- Bump release for June 2024 mass rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.10-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jun 22 2023 Jiri Kucera <jkucera@redhat.com> - 1.1.10-2
- Drop gtest on RHEL, migrate to SPDX license identifier
* Wed Jun 30 2021 Lianbo Jiang <lijiang@redhat.com> - 1.1.8-7 * Thu Mar 09 2023 Martin Gieseking <martin.gieseking@uos.de> - 1.1.10-1
- Drop BuildRequires dependency on gtest - Updated to version 1.1.10.
- Removed snappy-inline.patch as it's no longer required.
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.8-6 * Tue Jan 31 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.1.9-7
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Build with C++14 instead of C++11; gtest 1.13.0 requires it
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.9-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.9-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.9-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Jul 08 2021 Davide Cavalca <dcavalca@fedoraproject.org> - 1.1.9-2
- Do not forcibly disable RTTI
* Sat May 15 2021 Martin Gieseking <martin.gieseking@uos.de> - 1.1.9-1
- Updated to new release.
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.8-5 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save