1 |
commit: fe4310bcbcacb83aa15d13bb28919e6faea0f44b |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 31 08:06:20 2021 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 31 08:06:37 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe4310bc |
7 |
|
8 |
app-arch/zstd: Security cleanup |
9 |
|
10 |
Bug: https://bugs.gentoo.org/774258 |
11 |
Package-Manager: Portage-3.0.17, Repoman-3.0.2 |
12 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
13 |
|
14 |
app-arch/zstd/Manifest | 3 - |
15 |
app-arch/zstd/files/zstd-1.4.4-make43.patch | 60 ------ |
16 |
.../zstd/files/zstd-1.4.4-pkgconfig_libdir.patch | 215 --------------------- |
17 |
app-arch/zstd/files/zstd-1.4.5-fix-uclibc-ng.patch | 28 --- |
18 |
app-arch/zstd/zstd-1.4.4-r4.ebuild | 75 ------- |
19 |
app-arch/zstd/zstd-1.4.5.ebuild | 73 ------- |
20 |
app-arch/zstd/zstd-1.4.8-r1.ebuild | 69 ------- |
21 |
7 files changed, 523 deletions(-) |
22 |
|
23 |
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest |
24 |
index cd831a81e3e..f0e458f47e8 100644 |
25 |
--- a/app-arch/zstd/Manifest |
26 |
+++ b/app-arch/zstd/Manifest |
27 |
@@ -1,4 +1 @@ |
28 |
-DIST zstd-1.4.4.tar.gz 1962617 BLAKE2B e21841a53b6c60703e5500cfc2a02923c4c3e57975aa57e1060310171e0d83d7c8eda1bd0510d5736db5c310d76847d2105ac5f614867fc3a9dc3086a035dfd7 SHA512 8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf |
29 |
-DIST zstd-1.4.5.tar.gz 1987927 BLAKE2B 1497d4e87040e5c71466468ebf1a57f4073666f2b005229925bc1d95a4b4fcb2a51d88bb79be20f21860e5750da42f8aac21d2997421d07ba37bd6bb12a28b55 SHA512 b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387 |
30 |
-DIST zstd-1.4.8.tar.gz 1816546 BLAKE2B 950d03c408e9d3fc2081969553c46247a1b8c13a22542effbf70373625bbfeb2a810e0adf0e1c6180cef590e7a28487191b1a577982fddc7a00d1507b461efd5 SHA512 61ce5d61e24770e70c32680f32d58542d6a1b5cc65737256561d8e34c77a82c1d36c769c179da5ea8ed5ecb035b4a4af292b9717c65976172e282859a332137a |
31 |
DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133 |
32 |
|
33 |
diff --git a/app-arch/zstd/files/zstd-1.4.4-make43.patch b/app-arch/zstd/files/zstd-1.4.4-make43.patch |
34 |
deleted file mode 100644 |
35 |
index 679e0b791e3..00000000000 |
36 |
--- a/app-arch/zstd/files/zstd-1.4.4-make43.patch |
37 |
+++ /dev/null |
38 |
@@ -1,60 +0,0 @@ |
39 |
-From 06a57cf57e3c4e887cadcf688e3081154f3f6db4 Mon Sep 17 00:00:00 2001 |
40 |
-From: Bimba Shrestha <bimbashrestha@××.com> |
41 |
-Date: Thu, 6 Feb 2020 14:10:51 -0800 |
42 |
-Subject: [PATCH] [build-issue] More portable header prefix usage (#) (#1987) |
43 |
- |
44 |
-* make 4.3 build issue fix |
45 |
- |
46 |
-* Changing header name and adding comment |
47 |
---- |
48 |
- programs/Makefile | 11 +++++++---- |
49 |
- 1 file changed, 7 insertions(+), 4 deletions(-) |
50 |
- |
51 |
-diff --git a/programs/Makefile b/programs/Makefile |
52 |
-index b75314a8..a9ee3cb5 100644 |
53 |
---- a/programs/Makefile |
54 |
-+++ b/programs/Makefile |
55 |
-@@ -94,9 +94,12 @@ endif |
56 |
- |
57 |
- VOID = /dev/null |
58 |
- |
59 |
-+# Make 4.3 doesn't support '\#' anymore (https://lwn.net/Articles/810071/) |
60 |
-+NUM_SYMBOL := \# |
61 |
-+ |
62 |
- # thread detection |
63 |
- NO_THREAD_MSG := ==> no threads, building without multithreading support |
64 |
--HAVE_PTHREAD := $(shell printf '\#include <pthread.h>\nint main(void) { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o have_pthread$(EXT) have_pthread.c -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0; rm have_pthread.c) |
65 |
-+HAVE_PTHREAD := $(shell printf '$(NUM_SYMBOL)include <pthread.h>\nint main(void) { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o have_pthread$(EXT) have_pthread.c -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0; rm have_pthread.c) |
66 |
- HAVE_THREAD := $(shell [ "$(HAVE_PTHREAD)" -eq "1" -o -n "$(filter Windows%,$(OS))" ] && echo 1 || echo 0) |
67 |
- ifeq ($(HAVE_THREAD), 1) |
68 |
- THREAD_MSG := ==> building with threading support |
69 |
-@@ -108,7 +111,7 @@ endif |
70 |
- |
71 |
- # zlib detection |
72 |
- NO_ZLIB_MSG := ==> no zlib, building zstd without .gz support |
73 |
--HAVE_ZLIB := $(shell printf '\#include <zlib.h>\nint main(void) { return 0; }' > have_zlib.c && $(CC) $(FLAGS) -o have_zlib$(EXT) have_zlib.c -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0; rm have_zlib.c) |
74 |
-+HAVE_ZLIB := $(shell printf '$(NUM_SYMBOL)include <zlib.h>\nint main(void) { return 0; }' > have_zlib.c && $(CC) $(FLAGS) -o have_zlib$(EXT) have_zlib.c -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0; rm have_zlib.c) |
75 |
- ifeq ($(HAVE_ZLIB), 1) |
76 |
- ZLIB_MSG := ==> building zstd with .gz compression support |
77 |
- ZLIBCPP = -DZSTD_GZCOMPRESS -DZSTD_GZDECOMPRESS |
78 |
-@@ -119,7 +122,7 @@ endif |
79 |
- |
80 |
- # lzma detection |
81 |
- NO_LZMA_MSG := ==> no liblzma, building zstd without .xz/.lzma support |
82 |
--HAVE_LZMA := $(shell printf '\#include <lzma.h>\nint main(void) { return 0; }' > have_lzma.c && $(CC) $(FLAGS) -o have_lzma$(EXT) have_lzma.c -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0; rm have_lzma.c) |
83 |
-+HAVE_LZMA := $(shell printf '$(NUM_SYMBOL)include <lzma.h>\nint main(void) { return 0; }' > have_lzma.c && $(CC) $(FLAGS) -o have_lzma$(EXT) have_lzma.c -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0; rm have_lzma.c) |
84 |
- ifeq ($(HAVE_LZMA), 1) |
85 |
- LZMA_MSG := ==> building zstd with .xz/.lzma compression support |
86 |
- LZMACPP = -DZSTD_LZMACOMPRESS -DZSTD_LZMADECOMPRESS |
87 |
-@@ -130,7 +133,7 @@ endif |
88 |
- |
89 |
- # lz4 detection |
90 |
- NO_LZ4_MSG := ==> no liblz4, building zstd without .lz4 support |
91 |
--HAVE_LZ4 := $(shell printf '\#include <lz4frame.h>\n\#include <lz4.h>\nint main(void) { return 0; }' > have_lz4.c && $(CC) $(FLAGS) -o have_lz4$(EXT) have_lz4.c -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0; rm have_lz4.c) |
92 |
-+HAVE_LZ4 := $(shell printf '$(NUM_SYMBOL)include <lz4frame.h>\n\#include <lz4.h>\nint main(void) { return 0; }' > have_lz4.c && $(CC) $(FLAGS) -o have_lz4$(EXT) have_lz4.c -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0; rm have_lz4.c) |
93 |
- ifeq ($(HAVE_LZ4), 1) |
94 |
- LZ4_MSG := ==> building zstd with .lz4 compression support |
95 |
- LZ4CPP = -DZSTD_LZ4COMPRESS -DZSTD_LZ4DECOMPRESS |
96 |
--- |
97 |
-2.24.1 |
98 |
- |
99 |
|
100 |
diff --git a/app-arch/zstd/files/zstd-1.4.4-pkgconfig_libdir.patch b/app-arch/zstd/files/zstd-1.4.4-pkgconfig_libdir.patch |
101 |
deleted file mode 100644 |
102 |
index e8d745a56aa..00000000000 |
103 |
--- a/app-arch/zstd/files/zstd-1.4.4-pkgconfig_libdir.patch |
104 |
+++ /dev/null |
105 |
@@ -1,215 +0,0 @@ |
106 |
-From e668c9b52896e1cf92c99da3b01e3bdbbae77100 Mon Sep 17 00:00:00 2001 |
107 |
-From: "W. Felix Handte" <w@×××××××××××.com> |
108 |
-Date: Tue, 18 Feb 2020 10:50:38 -0500 |
109 |
-Subject: [PATCH 1/3] Fix pkg-config File Generation Again |
110 |
- |
111 |
-Revises #1851. Fixes #1900. Replaces #1930. |
112 |
- |
113 |
-Thanks to @orbea, @neheb, @Polynomial-C, and particularly @eli-schwartz for |
114 |
-pointing out the problem and suggesting solutions. |
115 |
- |
116 |
-Tested with |
117 |
- |
118 |
- ``` |
119 |
- make -C lib clean libzstd.pc |
120 |
- cat lib/libzstd.pc |
121 |
- |
122 |
- # should fail |
123 |
- make -C lib clean libzstd.pc LIBDIR=/foo |
124 |
- make -C lib clean libzstd.pc INCLUDEDIR=/foo |
125 |
- make -C lib clean libzstd.pc LIBDIR=/usr/localfoo |
126 |
- make -C lib clean libzstd.pc INCLUDEDIR=/usr/localfoo |
127 |
- make -C lib clean libzstd.pc LIBDIR=/usr/local/lib prefix=/foo |
128 |
- make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/include prefix=/foo |
129 |
- |
130 |
- # should succeed |
131 |
- make -C lib clean libzstd.pc LIBDIR=/usr/local/foo |
132 |
- make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/foo |
133 |
- make -C lib clean libzstd.pc LIBDIR=/usr/local/ |
134 |
- make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/ |
135 |
- make -C lib clean libzstd.pc LIBDIR=/usr/local |
136 |
- make -C lib clean libzstd.pc INCLUDEDIR=/usr/local |
137 |
- make -C lib clean libzstd.pc LIBDIR=/tmp/foo prefix=/tmp |
138 |
- make -C lib clean libzstd.pc INCLUDEDIR=/tmp/foo prefix=/tmp |
139 |
- make -C lib clean libzstd.pc LIBDIR=/tmp/foo prefix=/tmp/foo |
140 |
- make -C lib clean libzstd.pc INCLUDEDIR=/tmp/foo prefix=/tmp/foo |
141 |
- |
142 |
- # should also succeed |
143 |
- make -C lib clean libzstd.pc prefix=/foo LIBDIR=/foo/bar INCLUDEDIR=/foo/ |
144 |
- cat lib/libzstd.pc |
145 |
- |
146 |
- mkdir out |
147 |
- cd out |
148 |
- cmake ../build/cmake |
149 |
- make |
150 |
- cat lib/libzstd.pc |
151 |
- ``` |
152 |
---- |
153 |
- build/cmake/lib/CMakeLists.txt | 5 +++-- |
154 |
- lib/Makefile | 14 ++++++++++++-- |
155 |
- lib/libzstd.pc.in | 4 ++-- |
156 |
- 3 files changed, 17 insertions(+), 6 deletions(-) |
157 |
- |
158 |
-diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt |
159 |
-index e92647bf1..29ff57aa0 100644 |
160 |
---- a/build/cmake/lib/CMakeLists.txt |
161 |
-+++ b/build/cmake/lib/CMakeLists.txt |
162 |
-@@ -134,11 +134,12 @@ endif () |
163 |
- if (UNIX) |
164 |
- # pkg-config |
165 |
- set(PREFIX "${CMAKE_INSTALL_PREFIX}") |
166 |
-- set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}") |
167 |
-+ set(LIBDIR "${CMAKE_INSTALL_LIBDIR}") |
168 |
-+ set(INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}") |
169 |
- set(VERSION "${zstd_VERSION_MAJOR}.${zstd_VERSION_MINOR}.${zstd_VERSION_PATCH}") |
170 |
- add_custom_target(libzstd.pc ALL |
171 |
- ${CMAKE_COMMAND} -DIN="${LIBRARY_DIR}/libzstd.pc.in" -DOUT="libzstd.pc" |
172 |
-- -DPREFIX="${PREFIX}" -DVERSION="${VERSION}" |
173 |
-+ -DPREFIX="${PREFIX}" -DLIBDIR="${LIBDIR}" -DINCLUDEDIR="${INCLUDEDIR}" -DVERSION="${VERSION}" |
174 |
- -P "${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig.cmake" |
175 |
- COMMENT "Creating pkg-config file") |
176 |
- |
177 |
-diff --git a/lib/Makefile b/lib/Makefile |
178 |
-index fd1710cf1..dbd64994c 100644 |
179 |
---- a/lib/Makefile |
180 |
-+++ b/lib/Makefile |
181 |
-@@ -224,6 +224,16 @@ LIBDIR ?= $(libdir) |
182 |
- includedir ?= $(PREFIX)/include |
183 |
- INCLUDEDIR ?= $(includedir) |
184 |
- |
185 |
-+PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -e "s@^$(exec_prefix)\\(/\\|$$\\)@@p") |
186 |
-+PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -e "s@^$(prefix)\\(/\\|$$\\)@@p") |
187 |
-+ |
188 |
-+ifeq (,$(shell echo "$(LIBDIR)" | sed -n -e "\\@^$(exec_prefix)\\(/\\|$$\\)@ p")) |
189 |
-+$(error configured libdir ($(LIBDIR)) is outside of prefix ($(prefix)), can't generate pkg-config file) |
190 |
-+endif |
191 |
-+ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -e "\\@^$(prefix)\\(/\\|$$\\)@ p")) |
192 |
-+$(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(exec_prefix)), can't generate pkg-config file) |
193 |
-+endif |
194 |
-+ |
195 |
- ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly)) |
196 |
- PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig |
197 |
- else |
198 |
-@@ -239,11 +249,11 @@ endif |
199 |
- INSTALL_PROGRAM ?= $(INSTALL) |
200 |
- INSTALL_DATA ?= $(INSTALL) -m 644 |
201 |
- |
202 |
-- |
203 |
--libzstd.pc: |
204 |
- libzstd.pc: libzstd.pc.in |
205 |
- @echo creating pkgconfig |
206 |
- @sed -e 's|@PREFIX@|$(PREFIX)|' \ |
207 |
-+ -e 's|@LIBDIR@|$(PCLIBDIR)|' \ |
208 |
-+ -e 's|@INCLUDEDIR@|$(PCINCDIR)|' \ |
209 |
- -e 's|@VERSION@|$(VERSION)|' \ |
210 |
- $< >$@ |
211 |
- |
212 |
-diff --git a/lib/libzstd.pc.in b/lib/libzstd.pc.in |
213 |
-index e7880be47..8ec0235ad 100644 |
214 |
---- a/lib/libzstd.pc.in |
215 |
-+++ b/lib/libzstd.pc.in |
216 |
-@@ -4,8 +4,8 @@ |
217 |
- |
218 |
- prefix=@PREFIX@ |
219 |
- exec_prefix=${prefix} |
220 |
--includedir=${prefix}/include |
221 |
--libdir=${exec_prefix}/lib |
222 |
-+includedir=${prefix}/@INCLUDEDIR@ |
223 |
-+libdir=${exec_prefix}/@LIBDIR@ |
224 |
- |
225 |
- Name: zstd |
226 |
- Description: fast lossless compression algorithm library |
227 |
- |
228 |
-From 73737231b95976f24b7b9bff96240976b11dcce0 Mon Sep 17 00:00:00 2001 |
229 |
-From: "W. Felix Handte" <w@×××××××××××.com> |
230 |
-Date: Tue, 18 Feb 2020 13:17:17 -0500 |
231 |
-Subject: [PATCH 2/3] Allow Manual Overriding of pkg-config Lib and Include |
232 |
- Dirs |
233 |
- |
234 |
-When the `PCLIBDIR` or `PCINCDIR` is non-empty (either because we succeeded |
235 |
-in removing the prefix, or because it was manually set), we don't need to |
236 |
-perform the check. This lets us trust users who go to the trouble of setting |
237 |
-a manual override, rather than still blindly failing the make. |
238 |
- |
239 |
-They'll still be prefixed with `${prefix}/` / `${exec_prefix}/` in the |
240 |
-pkg-config file though. |
241 |
---- |
242 |
- lib/Makefile | 9 +++++++++ |
243 |
- 1 file changed, 9 insertions(+) |
244 |
- |
245 |
-diff --git a/lib/Makefile b/lib/Makefile |
246 |
-index dbd64994c..b067c11a2 100644 |
247 |
---- a/lib/Makefile |
248 |
-+++ b/lib/Makefile |
249 |
-@@ -227,12 +227,21 @@ INCLUDEDIR ?= $(includedir) |
250 |
- PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -e "s@^$(exec_prefix)\\(/\\|$$\\)@@p") |
251 |
- PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -e "s@^$(prefix)\\(/\\|$$\\)@@p") |
252 |
- |
253 |
-+ifeq (,$(PCLIBDIR)) |
254 |
-+# Additional prefix check is required, since the empty string is technically a |
255 |
-+# valid PCLIBDIR |
256 |
- ifeq (,$(shell echo "$(LIBDIR)" | sed -n -e "\\@^$(exec_prefix)\\(/\\|$$\\)@ p")) |
257 |
- $(error configured libdir ($(LIBDIR)) is outside of prefix ($(prefix)), can't generate pkg-config file) |
258 |
- endif |
259 |
-+endif |
260 |
-+ |
261 |
-+ifeq (,$(PCINCDIR)) |
262 |
-+# Additional prefix check is required, since the empty string is technically a |
263 |
-+# valid PCINCDIR |
264 |
- ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -e "\\@^$(prefix)\\(/\\|$$\\)@ p")) |
265 |
- $(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(exec_prefix)), can't generate pkg-config file) |
266 |
- endif |
267 |
-+endif |
268 |
- |
269 |
- ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly)) |
270 |
- PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig |
271 |
- |
272 |
-From e5ef935cf6160768e20cd73db3d9450aa8b7f8cf Mon Sep 17 00:00:00 2001 |
273 |
-From: "W. Felix Handte" <w@×××××××××××.com> |
274 |
-Date: Tue, 18 Feb 2020 13:40:58 -0500 |
275 |
-Subject: [PATCH 3/3] Fix Variable Capitalization |
276 |
- |
277 |
---- |
278 |
- lib/Makefile | 15 ++++++++------- |
279 |
- 1 file changed, 8 insertions(+), 7 deletions(-) |
280 |
- |
281 |
-diff --git a/lib/Makefile b/lib/Makefile |
282 |
-index b067c11a2..db35207bb 100644 |
283 |
---- a/lib/Makefile |
284 |
-+++ b/lib/Makefile |
285 |
-@@ -219,27 +219,28 @@ DESTDIR ?= |
286 |
- prefix ?= /usr/local |
287 |
- PREFIX ?= $(prefix) |
288 |
- exec_prefix ?= $(PREFIX) |
289 |
--libdir ?= $(exec_prefix)/lib |
290 |
-+EXEC_PREFIX ?= $(exec_prefix) |
291 |
-+libdir ?= $(EXEC_PREFIX)/lib |
292 |
- LIBDIR ?= $(libdir) |
293 |
- includedir ?= $(PREFIX)/include |
294 |
- INCLUDEDIR ?= $(includedir) |
295 |
- |
296 |
--PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -e "s@^$(exec_prefix)\\(/\\|$$\\)@@p") |
297 |
--PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -e "s@^$(prefix)\\(/\\|$$\\)@@p") |
298 |
-+PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -e "s@^$(EXEC_PREFIX)\\(/\\|$$\\)@@p") |
299 |
-+PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -e "s@^$(PREFIX)\\(/\\|$$\\)@@p") |
300 |
- |
301 |
- ifeq (,$(PCLIBDIR)) |
302 |
- # Additional prefix check is required, since the empty string is technically a |
303 |
- # valid PCLIBDIR |
304 |
--ifeq (,$(shell echo "$(LIBDIR)" | sed -n -e "\\@^$(exec_prefix)\\(/\\|$$\\)@ p")) |
305 |
--$(error configured libdir ($(LIBDIR)) is outside of prefix ($(prefix)), can't generate pkg-config file) |
306 |
-+ifeq (,$(shell echo "$(LIBDIR)" | sed -n -e "\\@^$(EXEC_PREFIX)\\(/\\|$$\\)@ p")) |
307 |
-+$(error configured libdir ($(LIBDIR)) is outside of prefix ($(PREFIX)), can't generate pkg-config file) |
308 |
- endif |
309 |
- endif |
310 |
- |
311 |
- ifeq (,$(PCINCDIR)) |
312 |
- # Additional prefix check is required, since the empty string is technically a |
313 |
- # valid PCINCDIR |
314 |
--ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -e "\\@^$(prefix)\\(/\\|$$\\)@ p")) |
315 |
--$(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(exec_prefix)), can't generate pkg-config file) |
316 |
-+ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -e "\\@^$(PREFIX)\\(/\\|$$\\)@ p")) |
317 |
-+$(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(EXEC_PREFIX)), can't generate pkg-config file) |
318 |
- endif |
319 |
- endif |
320 |
- |
321 |
|
322 |
diff --git a/app-arch/zstd/files/zstd-1.4.5-fix-uclibc-ng.patch b/app-arch/zstd/files/zstd-1.4.5-fix-uclibc-ng.patch |
323 |
deleted file mode 100644 |
324 |
index e4c2335d199..00000000000 |
325 |
--- a/app-arch/zstd/files/zstd-1.4.5-fix-uclibc-ng.patch |
326 |
+++ /dev/null |
327 |
@@ -1,28 +0,0 @@ |
328 |
-From 1dcc4787965aa8f4af48ed5a2154185750bbaff5 Mon Sep 17 00:00:00 2001 |
329 |
-From: Yann Collet <cyan@××.com> |
330 |
-Date: Mon, 13 Jul 2020 14:16:33 -0700 |
331 |
-Subject: [PATCH] fix uclibc's st_mtim |
332 |
- |
333 |
-reported and suggested by @ewildgoose (#1872) |
334 |
---- |
335 |
- programs/platform.h | 6 ++++++ |
336 |
- 1 file changed, 6 insertions(+) |
337 |
- |
338 |
-diff --git a/programs/platform.h b/programs/platform.h |
339 |
-index 2b4b9f2d8..68be70bb3 100644 |
340 |
---- a/programs/platform.h |
341 |
-+++ b/programs/platform.h |
342 |
-@@ -102,6 +102,12 @@ extern "C" { |
343 |
- # define PLATFORM_POSIX_VERSION 1 |
344 |
- # endif |
345 |
- |
346 |
-+# ifdef __UCLIBC__ |
347 |
-+# ifndef __USE_MISC |
348 |
-+# define __USE_MISC /* enable st_mtim on uclibc */ |
349 |
-+# endif |
350 |
-+# endif |
351 |
-+ |
352 |
- # else /* non-unix target platform (like Windows) */ |
353 |
- # define PLATFORM_POSIX_VERSION 0 |
354 |
- # endif |
355 |
- |
356 |
|
357 |
diff --git a/app-arch/zstd/zstd-1.4.4-r4.ebuild b/app-arch/zstd/zstd-1.4.4-r4.ebuild |
358 |
deleted file mode 100644 |
359 |
index b361ae879fc..00000000000 |
360 |
--- a/app-arch/zstd/zstd-1.4.4-r4.ebuild |
361 |
+++ /dev/null |
362 |
@@ -1,75 +0,0 @@ |
363 |
-# Copyright 1999-2021 Gentoo Authors |
364 |
-# Distributed under the terms of the GNU General Public License v2 |
365 |
- |
366 |
-EAPI=7 |
367 |
- |
368 |
-inherit flag-o-matic multilib-minimal toolchain-funcs |
369 |
- |
370 |
-DESCRIPTION="zstd fast compression library" |
371 |
-HOMEPAGE="https://facebook.github.io/zstd/" |
372 |
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
373 |
- |
374 |
-LICENSE="|| ( BSD GPL-2 )" |
375 |
-SLOT="0/1" |
376 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
377 |
-IUSE="lz4 static-libs +threads" |
378 |
- |
379 |
-RDEPEND="app-arch/xz-utils |
380 |
- lz4? ( app-arch/lz4 )" |
381 |
-DEPEND="${RDEPEND}" |
382 |
- |
383 |
-PATCHES=( |
384 |
- "${FILESDIR}/${P}-pkgconfig_libdir.patch" #700780 |
385 |
- "${FILESDIR}/${P}-make43.patch" #708110 |
386 |
- "${FILESDIR}/${PN}-1.4.5-fix-uclibc-ng.patch" #741972 |
387 |
-) |
388 |
- |
389 |
-src_prepare() { |
390 |
- default |
391 |
- multilib_copy_sources |
392 |
- |
393 |
- # Workaround #713940 / https://github.com/facebook/zstd/issues/2045 |
394 |
- # where upstream build system does not add -pthread for Makefile-based |
395 |
- # build system. |
396 |
- use threads && append-flags $(test-flags-CCLD -pthread) |
397 |
-} |
398 |
- |
399 |
-mymake() { |
400 |
- emake \ |
401 |
- CC="$(tc-getCC)" \ |
402 |
- CXX="$(tc-getCXX)" \ |
403 |
- AR="$(tc-getAR)" \ |
404 |
- PREFIX="${EPREFIX}/usr" \ |
405 |
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
406 |
- "${@}" |
407 |
-} |
408 |
- |
409 |
-multilib_src_compile() { |
410 |
- local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') ) |
411 |
- |
412 |
- mymake -C lib ${libzstd_targets[@]} libzstd.pc |
413 |
- |
414 |
- if multilib_is_native_abi ; then |
415 |
- mymake HAVE_LZ4="$(usex lz4 1 0)" zstd |
416 |
- |
417 |
- mymake -C contrib/pzstd |
418 |
- fi |
419 |
-} |
420 |
- |
421 |
-multilib_src_install() { |
422 |
- mymake -C lib DESTDIR="${D}" install |
423 |
- |
424 |
- if multilib_is_native_abi ; then |
425 |
- mymake -C programs DESTDIR="${D}" install |
426 |
- |
427 |
- mymake -C contrib/pzstd DESTDIR="${D}" install |
428 |
- fi |
429 |
-} |
430 |
- |
431 |
-multilib_src_install_all() { |
432 |
- einstalldocs |
433 |
- |
434 |
- if ! use static-libs; then |
435 |
- find "${ED}" -name "*.a" -delete || die |
436 |
- fi |
437 |
-} |
438 |
|
439 |
diff --git a/app-arch/zstd/zstd-1.4.5.ebuild b/app-arch/zstd/zstd-1.4.5.ebuild |
440 |
deleted file mode 100644 |
441 |
index e8a10f35729..00000000000 |
442 |
--- a/app-arch/zstd/zstd-1.4.5.ebuild |
443 |
+++ /dev/null |
444 |
@@ -1,73 +0,0 @@ |
445 |
-# Copyright 1999-2021 Gentoo Authors |
446 |
-# Distributed under the terms of the GNU General Public License v2 |
447 |
- |
448 |
-EAPI=7 |
449 |
- |
450 |
-inherit flag-o-matic multilib-minimal toolchain-funcs |
451 |
- |
452 |
-DESCRIPTION="zstd fast compression library" |
453 |
-HOMEPAGE="https://facebook.github.io/zstd/" |
454 |
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
455 |
- |
456 |
-LICENSE="|| ( BSD GPL-2 )" |
457 |
-SLOT="0/1" |
458 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
459 |
-IUSE="lz4 static-libs +threads" |
460 |
- |
461 |
-RDEPEND="app-arch/xz-utils |
462 |
- lz4? ( app-arch/lz4 )" |
463 |
-DEPEND="${RDEPEND}" |
464 |
- |
465 |
-PATCHES=( |
466 |
- "${FILESDIR}/${P}-fix-uclibc-ng.patch" #741972 |
467 |
-) |
468 |
- |
469 |
-src_prepare() { |
470 |
- default |
471 |
- multilib_copy_sources |
472 |
- |
473 |
- # Workaround #713940 / https://github.com/facebook/zstd/issues/2045 |
474 |
- # where upstream build system does not add -pthread for Makefile-based |
475 |
- # build system. |
476 |
- use threads && append-flags $(test-flags-CCLD -pthread) |
477 |
-} |
478 |
- |
479 |
-mymake() { |
480 |
- emake \ |
481 |
- CC="$(tc-getCC)" \ |
482 |
- CXX="$(tc-getCXX)" \ |
483 |
- AR="$(tc-getAR)" \ |
484 |
- PREFIX="${EPREFIX}/usr" \ |
485 |
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
486 |
- "${@}" |
487 |
-} |
488 |
- |
489 |
-multilib_src_compile() { |
490 |
- local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') ) |
491 |
- |
492 |
- mymake -C lib ${libzstd_targets[@]} libzstd.pc |
493 |
- |
494 |
- if multilib_is_native_abi ; then |
495 |
- mymake HAVE_LZ4="$(usex lz4 1 0)" zstd |
496 |
- |
497 |
- mymake -C contrib/pzstd |
498 |
- fi |
499 |
-} |
500 |
- |
501 |
-multilib_src_install() { |
502 |
- mymake -C lib DESTDIR="${D}" install |
503 |
- |
504 |
- if multilib_is_native_abi ; then |
505 |
- mymake -C programs DESTDIR="${D}" install |
506 |
- |
507 |
- mymake -C contrib/pzstd DESTDIR="${D}" install |
508 |
- fi |
509 |
-} |
510 |
- |
511 |
-multilib_src_install_all() { |
512 |
- einstalldocs |
513 |
- |
514 |
- if ! use static-libs; then |
515 |
- find "${ED}" -name "*.a" -delete || die |
516 |
- fi |
517 |
-} |
518 |
|
519 |
diff --git a/app-arch/zstd/zstd-1.4.8-r1.ebuild b/app-arch/zstd/zstd-1.4.8-r1.ebuild |
520 |
deleted file mode 100644 |
521 |
index a7b21ee6fe5..00000000000 |
522 |
--- a/app-arch/zstd/zstd-1.4.8-r1.ebuild |
523 |
+++ /dev/null |
524 |
@@ -1,69 +0,0 @@ |
525 |
-# Copyright 1999-2021 Gentoo Authors |
526 |
-# Distributed under the terms of the GNU General Public License v2 |
527 |
- |
528 |
-EAPI=7 |
529 |
- |
530 |
-inherit flag-o-matic multilib-minimal toolchain-funcs |
531 |
- |
532 |
-DESCRIPTION="zstd fast compression library" |
533 |
-HOMEPAGE="https://facebook.github.io/zstd/" |
534 |
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
535 |
- |
536 |
-LICENSE="|| ( BSD GPL-2 )" |
537 |
-SLOT="0/1" |
538 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
539 |
-IUSE="lz4 static-libs +threads" |
540 |
- |
541 |
-RDEPEND="app-arch/xz-utils |
542 |
- lz4? ( app-arch/lz4 )" |
543 |
-DEPEND="${RDEPEND}" |
544 |
- |
545 |
-src_prepare() { |
546 |
- default |
547 |
- multilib_copy_sources |
548 |
- |
549 |
- # Workaround #713940 / https://github.com/facebook/zstd/issues/2045 |
550 |
- # where upstream build system does not add -pthread for Makefile-based |
551 |
- # build system. |
552 |
- use threads && append-flags $(test-flags-CCLD -pthread) |
553 |
-} |
554 |
- |
555 |
-mymake() { |
556 |
- emake \ |
557 |
- CC="$(tc-getCC)" \ |
558 |
- CXX="$(tc-getCXX)" \ |
559 |
- AR="$(tc-getAR)" \ |
560 |
- PREFIX="${EPREFIX}/usr" \ |
561 |
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
562 |
- "${@}" |
563 |
-} |
564 |
- |
565 |
-multilib_src_compile() { |
566 |
- local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') ) |
567 |
- |
568 |
- mymake -C lib ${libzstd_targets[@]} libzstd.pc |
569 |
- |
570 |
- if multilib_is_native_abi ; then |
571 |
- mymake HAVE_LZ4="$(usex lz4 1 0)" zstd |
572 |
- |
573 |
- mymake -C contrib/pzstd |
574 |
- fi |
575 |
-} |
576 |
- |
577 |
-multilib_src_install() { |
578 |
- mymake -C lib DESTDIR="${D}" install |
579 |
- |
580 |
- if multilib_is_native_abi ; then |
581 |
- mymake -C programs DESTDIR="${D}" install |
582 |
- |
583 |
- mymake -C contrib/pzstd DESTDIR="${D}" install |
584 |
- fi |
585 |
-} |
586 |
- |
587 |
-multilib_src_install_all() { |
588 |
- einstalldocs |
589 |
- |
590 |
- if ! use static-libs; then |
591 |
- find "${ED}" -name "*.a" -delete || die |
592 |
- fi |
593 |
-} |