1 |
commit: b337a85f0aa53a1a01aa9062eb332d9948200d54 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 14 21:00:28 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 19 08:13:34 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b337a85f |
7 |
|
8 |
app-arch/snappy: drop 1.1.8, 1.1.9 |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
|
12 |
app-arch/snappy/Manifest | 1 - |
13 |
...ke-Add-missing-linking-to-GTEST_LIBRARIES.patch | 30 ---------- |
14 |
app-arch/snappy/snappy-1.1.8.ebuild | 64 ---------------------- |
15 |
app-arch/snappy/snappy-1.1.9.ebuild | 46 ---------------- |
16 |
4 files changed, 141 deletions(-) |
17 |
|
18 |
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest |
19 |
index 6ecc06c83362..6d2cae5cff27 100644 |
20 |
--- a/app-arch/snappy/Manifest |
21 |
+++ b/app-arch/snappy/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST snappy-1.1.8.tar.gz 1096137 BLAKE2B e21f2ea23727f118920b7f67981354194f12d1d61eaa18eb1cb2f4285fabafdd221b88cf1e3b3261634f65469a714d3efe6b218c0b1e9d41639cdeb21097d75e SHA512 efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c |
24 |
DIST snappy-1.1.9.tar.gz 1102382 BLAKE2B 926d03156168e3d4800dc17144db3de2c182c6eb9970d87a00b94fb09b67e403479a64cbed75833b83fd03173c1bb8caaf248a55627e89fe2a34456f12ff3b42 SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024 |
25 |
|
26 |
diff --git a/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch b/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch |
27 |
deleted file mode 100644 |
28 |
index f4fdd4727488..000000000000 |
29 |
--- a/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch |
30 |
+++ /dev/null |
31 |
@@ -1,30 +0,0 @@ |
32 |
-From 1c9f699a6275f085ad710c9ae940e096ce552452 Mon Sep 17 00:00:00 2001 |
33 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
34 |
-Date: Mon, 31 Jul 2017 20:49:22 +0200 |
35 |
-Subject: [PATCH] cmake: Add missing linking to GTEST_LIBRARIES |
36 |
- |
37 |
-Since the snappy_unittest target uses gtest routines (when available), |
38 |
-it needs to link to gtest explicitly. Otherwise, the build fails due |
39 |
-to unavailable gtest symbols. |
40 |
---- |
41 |
- CMakeLists.txt | 5 ++++- |
42 |
- 1 file changed, 4 insertions(+), 1 deletion(-) |
43 |
- |
44 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
45 |
-index 3f534b1..3a44aa9 100644 |
46 |
---- a/CMakeLists.txt |
47 |
-+++ b/CMakeLists.txt |
48 |
-@@ -119,6 +119,9 @@ if(SNAPPY_BUILD_TESTS) |
49 |
- ) |
50 |
- target_compile_definitions(snappy_unittest PRIVATE -DHAVE_CONFIG_H) |
51 |
-- target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES}) |
52 |
-+ target_link_libraries(snappy_unittest |
53 |
-+ snappy |
54 |
-+ ${GFLAGS_LIBRARIES} |
55 |
-+ ${GTEST_LIBRARIES}) |
56 |
- |
57 |
- if(HAVE_LIBZ) |
58 |
- target_link_libraries(snappy_unittest z) |
59 |
--- |
60 |
-2.14.1 |
61 |
- |
62 |
|
63 |
diff --git a/app-arch/snappy/snappy-1.1.8.ebuild b/app-arch/snappy/snappy-1.1.8.ebuild |
64 |
deleted file mode 100644 |
65 |
index aeb144459747..000000000000 |
66 |
--- a/app-arch/snappy/snappy-1.1.8.ebuild |
67 |
+++ /dev/null |
68 |
@@ -1,64 +0,0 @@ |
69 |
-# Copyright 1999-2021 Gentoo Authors |
70 |
-# Distributed under the terms of the GNU General Public License v2 |
71 |
- |
72 |
-EAPI=7 |
73 |
- |
74 |
-CMAKE_ECLASS=cmake |
75 |
-inherit cmake-multilib |
76 |
- |
77 |
-DESCRIPTION="A high-speed compression/decompression library by Google" |
78 |
-HOMEPAGE="https://github.com/google/snappy" |
79 |
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
80 |
- |
81 |
-LICENSE="BSD" |
82 |
-SLOT="0/${PV%%.*}" |
83 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" |
84 |
-IUSE="test" |
85 |
-RESTRICT="!test? ( test )" |
86 |
- |
87 |
-# all test dependencies are optional: |
88 |
-# - gflags-2.2 is supposedly needed for command-line option parsing |
89 |
-# but it's a huge hack and does not work, |
90 |
-# - gtest probably gives nicer output, |
91 |
-# - compression libraries are used for benchmarks which we do not run. |
92 |
-DEPEND="test? ( dev-cpp/gtest )" |
93 |
- |
94 |
-# AUTHORS is useless, ChangeLog is stale |
95 |
-DOCS=( format_description.txt framing_format.txt NEWS README.md ) |
96 |
- |
97 |
-src_prepare() { |
98 |
- local PATCHES=( |
99 |
- "${FILESDIR}"/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch |
100 |
- ) |
101 |
- |
102 |
- # command-line option parsing does not work at all, so just force |
103 |
- # it off |
104 |
- sed -i -e '/run_microbenchmarks/s:true:false:' snappy-test.cc || die |
105 |
- |
106 |
- cmake_src_prepare |
107 |
-} |
108 |
- |
109 |
-multilib_src_configure() { |
110 |
- # TODO: would be nice to make unittest build conditional |
111 |
- # but it is not a priority right now |
112 |
- local mycmakeargs=( |
113 |
- -DBUILD_SHARED_LIBS=ON |
114 |
- |
115 |
- # use gtest for tests only |
116 |
- -DCMAKE_DISABLE_FIND_PACKAGE_GTest=$(usex '!test') |
117 |
- # gflags does not work anyway |
118 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Gflags=ON |
119 |
- |
120 |
- # we do not want to run benchmarks, and those are only used |
121 |
- # for benchmarks |
122 |
- -DHAVE_LIBZ=NO |
123 |
- -DHAVE_LIBLZO2=NO |
124 |
- ) |
125 |
- cmake_src_configure |
126 |
-} |
127 |
- |
128 |
-multilib_src_test() { |
129 |
- # run tests directly to get verbose output |
130 |
- cd "${S}" || die |
131 |
- "${BUILD_DIR}"/snappy_unittest || die |
132 |
-} |
133 |
|
134 |
diff --git a/app-arch/snappy/snappy-1.1.9.ebuild b/app-arch/snappy/snappy-1.1.9.ebuild |
135 |
deleted file mode 100644 |
136 |
index 0d7529657a0a..000000000000 |
137 |
--- a/app-arch/snappy/snappy-1.1.9.ebuild |
138 |
+++ /dev/null |
139 |
@@ -1,46 +0,0 @@ |
140 |
-# Copyright 1999-2021 Gentoo Authors |
141 |
-# Distributed under the terms of the GNU General Public License v2 |
142 |
- |
143 |
-EAPI=7 |
144 |
- |
145 |
-CMAKE_ECLASS=cmake |
146 |
-inherit cmake-multilib |
147 |
- |
148 |
-DESCRIPTION="A high-speed compression/decompression library by Google" |
149 |
-HOMEPAGE="https://github.com/google/snappy" |
150 |
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
151 |
- |
152 |
-LICENSE="BSD" |
153 |
-SLOT="0/${PV%%.*}" |
154 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" |
155 |
-IUSE="test" |
156 |
-RESTRICT="!test? ( test )" |
157 |
- |
158 |
-DEPEND="test? ( dev-cpp/gtest )" |
159 |
- |
160 |
-DOCS=( format_description.txt framing_format.txt NEWS README.md ) |
161 |
- |
162 |
-PATCHES=( |
163 |
- "${FILESDIR}/${P}_gcc_inline.patch" |
164 |
- "${FILESDIR}/${P}_external_gtest.patch" |
165 |
- "${FILESDIR}/${PN}-1.1.9-clang-werror.patch" |
166 |
-) |
167 |
- |
168 |
-multilib_src_configure() { |
169 |
- local mycmakeargs=( |
170 |
- -DSNAPPY_BUILD_TESTS=$(usex test) |
171 |
- -DSNAPPY_BUILD_BENCHMARKS=OFF |
172 |
- |
173 |
- # Options below are related to benchmarking, that we disable. |
174 |
- -DHAVE_LIBZ=NO |
175 |
- -DHAVE_LIBLZO2=NO |
176 |
- -DHAVE_LIBLZ4=NO |
177 |
- ) |
178 |
- cmake_src_configure |
179 |
-} |
180 |
- |
181 |
-multilib_src_test() { |
182 |
- # run tests directly to get verbose output |
183 |
- cd "${S}" || die |
184 |
- "${BUILD_DIR}"/snappy_unittest || die |
185 |
-} |