1 |
commit: 2eb3803f004222e2f284ec27f71683b3b3c135b7 |
2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 1 21:26:26 2021 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 1 21:44:53 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eb3803f |
7 |
|
8 |
dev-libs/concurrencykit: drop old version |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
12 |
|
13 |
dev-libs/concurrencykit/Manifest | 1 - |
14 |
.../concurrencykit/concurrencykit-0.7.0-r1.ebuild | 41 -------- |
15 |
.../files/concurrencykit-0.7.0-ar.patch | 112 --------------------- |
16 |
.../files/concurrencykit-0.7.0-glibc-2.30.patch | 54 ---------- |
17 |
.../files/concurrencykit-0.7.0-gzip.patch | 58 ----------- |
18 |
.../files/concurrencykit-0.7.0-static-libs.patch | 75 -------------- |
19 |
.../files/concurrencykit-0.7.0-tests.patch | 33 ------ |
20 |
7 files changed, 374 deletions(-) |
21 |
|
22 |
diff --git a/dev-libs/concurrencykit/Manifest b/dev-libs/concurrencykit/Manifest |
23 |
index 30c95878f4c..c4ba83f50e5 100644 |
24 |
--- a/dev-libs/concurrencykit/Manifest |
25 |
+++ b/dev-libs/concurrencykit/Manifest |
26 |
@@ -1,2 +1 @@ |
27 |
-DIST concurrencykit-0.7.0.tar.gz 245574 BLAKE2B 14c386eb35c76297933d2935cdfc1cb0d21071d4fe1784eeb27595c2e75a8edc5add349df6795d03372b30711cda4deeb7957bdcfd7e62ba89b254fb41ba6a55 SHA512 509fe5bc1575a6fd646d30fbcd74204ba4683092f154dc1fb55ed6fc17e734e17759bacfc3f42344db4c243ca6b239f7d207cf2ebc609e2a37d7ddfd1bdcc3a1 |
28 |
DIST concurrencykit-0.7.1.tar.gz 252802 BLAKE2B 907db3b244544a9c46db7432f2c3d07c20652882067157974ce54c71c27f21fdc87d41e068efc71f88392a94895e0de1a8f3ae90605b4267606cfa7d29c7dc35 SHA512 48768e7adf05b818f2951b246c90185071d6c3f874218349183d96b7887830f9505f9fa58576e9933862486e8543097df0ee667518009a3946d1edc19fc253f7 |
29 |
|
30 |
diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild |
31 |
deleted file mode 100644 |
32 |
index fb0bfdf8563..00000000000 |
33 |
--- a/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,41 +0,0 @@ |
36 |
-# Copyright 1999-2021 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=7 |
40 |
- |
41 |
-inherit toolchain-funcs |
42 |
- |
43 |
-MY_PN="ck" |
44 |
-MY_P="${MY_PN}-${PV}" |
45 |
- |
46 |
-DESCRIPTION="A library with concurrency related algorithms and data structures in C" |
47 |
-HOMEPAGE="http://concurrencykit.org" |
48 |
-SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
49 |
-S="${WORKDIR}/${MY_P}" |
50 |
- |
51 |
-LICENSE="Apache-2.0 BSD-2" |
52 |
-SLOT="0" |
53 |
-KEYWORDS="amd64 ~arm ~arm64 x86" |
54 |
- |
55 |
-# The 'libck.so' has a name collision. |
56 |
-# See #616762 for more information. |
57 |
-RDEPEND="!sys-cluster/charm" |
58 |
- |
59 |
-PATCHES=( |
60 |
- "${FILESDIR}/${P}-ar.patch" |
61 |
- "${FILESDIR}/${P}-glibc-2.30.patch" |
62 |
- "${FILESDIR}/${P}-gzip.patch" |
63 |
- "${FILESDIR}/${P}-static-libs.patch" |
64 |
- "${FILESDIR}/${P}-tests.patch" |
65 |
-) |
66 |
- |
67 |
-src_configure() { |
68 |
- tc-export AR CC LD |
69 |
- $(usex x86 'export PROFILE=x86' '') |
70 |
- |
71 |
- local myeconfargs=( |
72 |
- "--disable-static" |
73 |
- ) |
74 |
- |
75 |
- GZIP="" econf ${myeconfargs[@]} |
76 |
-} |
77 |
|
78 |
diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-ar.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-ar.patch |
79 |
deleted file mode 100644 |
80 |
index 70dd46a113f..00000000000 |
81 |
--- a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-ar.patch |
82 |
+++ /dev/null |
83 |
@@ -1,112 +0,0 @@ |
84 |
-From c6a2f41369bb4549bfaadf1120ccacd884b0b70f Mon Sep 17 00:00:00 2001 |
85 |
-From: Conrad Kostecki <ck@××××××××.de> |
86 |
-Date: Sun, 22 Nov 2020 00:55:36 +0100 |
87 |
-Subject: [PATCH] Add support for setting AR |
88 |
- |
89 |
-By default, the command 'ar' is called. Is should be possible, as with |
90 |
-'CC', to override that value and set an own AR. |
91 |
- |
92 |
-Signed-off-by: Conrad Kostecki <conrad@××××××××.com> |
93 |
---- |
94 |
- configure | 11 +++++++++++ |
95 |
- src/Makefile.in | 2 +- |
96 |
- 2 files changed, 12 insertions(+), 1 deletion(-) |
97 |
- |
98 |
-diff --git a/configure b/configure |
99 |
-index 1b85d113..78535332 100755 |
100 |
---- a/configure |
101 |
-+++ b/configure |
102 |
-@@ -146,6 +146,7 @@ generate_stdout() |
103 |
- echo " SRC_DIR = $BUILD_DIR" |
104 |
- echo " SYSTEM = $SYSTEM" |
105 |
- echo " PROFILE = $PROFILE" |
106 |
-+ echo " AR = $AR" |
107 |
- echo " CC = $CC" |
108 |
- echo " COMPILER = $COMPILER" |
109 |
- echo " CFLAGS = $CFLAGS" |
110 |
-@@ -215,6 +216,7 @@ for option; do |
111 |
- echo " --cores=N Specify number of cores available on target machine" |
112 |
- echo |
113 |
- echo "The following environment variables may be used:" |
114 |
-+ echo " AR AR archiver command" |
115 |
- echo " CC C compiler command" |
116 |
- echo " CFLAGS C compiler flags" |
117 |
- echo " LDFLAGS Linker flags" |
118 |
-@@ -645,6 +647,15 @@ if test ! -x "${CC}"; then |
119 |
- fi |
120 |
- assert "$CC" "not found" |
121 |
- |
122 |
-+printf "Finding suitable archiver........" |
123 |
-+if test ! -x "${AR}"; then |
124 |
-+ AR=`pathsearch "${AR:-ar}"` |
125 |
-+ if test -z "$AR" -o ! -x "$AR"; then |
126 |
-+ AR=`pathsearch "${AR:-ar}"` |
127 |
-+ fi |
128 |
-+fi |
129 |
-+assert "$AR" "not found" |
130 |
-+ |
131 |
- cat << EOF > .1.c |
132 |
- #include <stdio.h> |
133 |
- int main(void) { |
134 |
-diff --git a/src/Makefile.in b/src/Makefile.in |
135 |
-index 0b7ae7b6..73788497 100644 |
136 |
---- a/src/Makefile.in |
137 |
-+++ b/src/Makefile.in |
138 |
-@@ -25,7 +25,7 @@ libck.so: $(OBJECTS) |
139 |
- $(LD) $(LDFLAGS) -o $(TARGET_DIR)/libck.so $(OBJECTS) |
140 |
- |
141 |
- libck.a: $(OBJECTS) |
142 |
-- ar rcs $(TARGET_DIR)/libck.a $(OBJECTS) |
143 |
-+ $(AR) rcs $(TARGET_DIR)/libck.a $(OBJECTS) |
144 |
- |
145 |
- ck_array.o: $(INCLUDE_DIR)/ck_array.h $(SDIR)/ck_array.c |
146 |
- $(CC) $(CFLAGS) -c -o $(TARGET_DIR)/ck_array.o $(SDIR)/ck_array.c |
147 |
-From 866c2af332a075cc83af78b184be0d5e6152de13 Mon Sep 17 00:00:00 2001 |
148 |
-From: Olivier Houchard <cognet@×××.org> |
149 |
-Date: Sun, 22 Nov 2020 01:16:10 +0100 |
150 |
-Subject: [PATCH] build: Make the lookup for an archiver report success. |
151 |
- |
152 |
-Move the code looking for ar outside the compiler checking code, and make |
153 |
-it report success if found. |
154 |
---- |
155 |
- configure | 20 +++++++++++--------- |
156 |
- 1 file changed, 11 insertions(+), 9 deletions(-) |
157 |
- |
158 |
-diff --git a/configure b/configure |
159 |
-index 78535332..16a8f64f 100755 |
160 |
---- a/configure |
161 |
-+++ b/configure |
162 |
-@@ -647,15 +647,6 @@ if test ! -x "${CC}"; then |
163 |
- fi |
164 |
- assert "$CC" "not found" |
165 |
- |
166 |
--printf "Finding suitable archiver........" |
167 |
--if test ! -x "${AR}"; then |
168 |
-- AR=`pathsearch "${AR:-ar}"` |
169 |
-- if test -z "$AR" -o ! -x "$AR"; then |
170 |
-- AR=`pathsearch "${AR:-ar}"` |
171 |
-- fi |
172 |
--fi |
173 |
--assert "$AR" "not found" |
174 |
-- |
175 |
- cat << EOF > .1.c |
176 |
- #include <stdio.h> |
177 |
- int main(void) { |
178 |
-@@ -736,6 +727,17 @@ else |
179 |
- assert "" "unknown compiler" |
180 |
- fi |
181 |
- |
182 |
-+printf "Finding suitable archiver........" |
183 |
-+if test ! -x "${AR}"; then |
184 |
-+ AR=`pathsearch "${AR:-ar}"` |
185 |
-+ if test -z "$AR" -o ! -x "$AR"; then |
186 |
-+ AR=`pathsearch "${AR:-ar}"` |
187 |
-+ else |
188 |
-+ echo "success [$AR]" |
189 |
-+ fi |
190 |
-+fi |
191 |
-+assert "$AR" "not found" |
192 |
-+ |
193 |
- printf "Detecting VMA bits..............." |
194 |
- VMA="unknown" |
195 |
- if test "$VMA_BITS" = "unknown"; then |
196 |
|
197 |
diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-glibc-2.30.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-glibc-2.30.patch |
198 |
deleted file mode 100644 |
199 |
index 77e63e3de7e..00000000000 |
200 |
--- a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-glibc-2.30.patch |
201 |
+++ /dev/null |
202 |
@@ -1,54 +0,0 @@ |
203 |
-From b520d58d00b7ed6c5cc9bc97c62f07e09f4f49ad Mon Sep 17 00:00:00 2001 |
204 |
-From: Samy Al Bahra <sbahra@×××××××××.io> |
205 |
-Date: Tue, 29 Oct 2019 17:30:09 -0400 |
206 |
-Subject: [PATCH] regressions/common: rename gettid wrapper to common_gettid. |
207 |
- |
208 |
-glibc-2.30 added a wrapper to gettid (https://lwn.net/Articles/795127/). |
209 |
-gettid will clash with the glibc-provided symbol. Remove the |
210 |
-macro and instead move to a dedicated namespace. |
211 |
- |
212 |
-We go this route to avoid introducing unnecessary complexity to |
213 |
-build. |
214 |
- |
215 |
-Fixes #147 |
216 |
---- |
217 |
- regressions/common.h | 8 +++----- |
218 |
- 1 file changed, 3 insertions(+), 5 deletions(-) |
219 |
- |
220 |
-diff --git a/regressions/common.h b/regressions/common.h |
221 |
-index 6e53483d..9cdc690a 100644 |
222 |
---- a/regressions/common.h |
223 |
-+++ b/regressions/common.h |
224 |
-@@ -267,13 +267,11 @@ struct affinity { |
225 |
- #define AFFINITY_INITIALIZER {0, 0} |
226 |
- |
227 |
- #ifdef __linux__ |
228 |
--#ifndef gettid |
229 |
- static pid_t |
230 |
--gettid(void) |
231 |
-+common_gettid(void) |
232 |
- { |
233 |
- return syscall(__NR_gettid); |
234 |
- } |
235 |
--#endif /* gettid */ |
236 |
- |
237 |
- CK_CC_UNUSED static int |
238 |
- aff_iterate(struct affinity *acb) |
239 |
-@@ -285,7 +283,7 @@ aff_iterate(struct affinity *acb) |
240 |
- CPU_ZERO(&s); |
241 |
- CPU_SET(c % CORES, &s); |
242 |
- |
243 |
-- if (sched_setaffinity(gettid(), sizeof(s), &s) != 0) |
244 |
-+ if (sched_setaffinity(common_gettid(), sizeof(s), &s) != 0) |
245 |
- perror("WARNING: Could not affine thread"); |
246 |
- |
247 |
- return 0; |
248 |
-@@ -300,7 +298,7 @@ aff_iterate_core(struct affinity *acb, unsigned int *core) |
249 |
- CPU_ZERO(&s); |
250 |
- CPU_SET((*core) % CORES, &s); |
251 |
- |
252 |
-- if (sched_setaffinity(gettid(), sizeof(s), &s) != 0) |
253 |
-+ if (sched_setaffinity(common_gettid(), sizeof(s), &s) != 0) |
254 |
- perror("WARNING: Could not affine thread"); |
255 |
- |
256 |
- return 0; |
257 |
|
258 |
diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-gzip.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-gzip.patch |
259 |
deleted file mode 100644 |
260 |
index 62477f9acf6..00000000000 |
261 |
--- a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-gzip.patch |
262 |
+++ /dev/null |
263 |
@@ -1,58 +0,0 @@ |
264 |
-From cb63256ae2e5fde7a67d7740bb2f4a0eab538a2d Mon Sep 17 00:00:00 2001 |
265 |
-From: Samy Al Bahra <sbahra@×××××××××.io> |
266 |
-Date: Thu, 9 Apr 2020 20:08:40 -0400 |
267 |
-Subject: [PATCH] build: allow GZIP to be set to empty string in configure. |
268 |
- |
269 |
---- |
270 |
- configure | 25 +++++++++++++++---------- |
271 |
- 1 file changed, 15 insertions(+), 10 deletions(-) |
272 |
- |
273 |
-diff --git a/configure b/configure |
274 |
-index 2cbdbef3..ed188f96 100755 |
275 |
---- a/configure |
276 |
-+++ b/configure |
277 |
-@@ -325,7 +325,7 @@ done |
278 |
- HEADERS=${HEADERS:-"${PREFIX}/include"} |
279 |
- LIBRARY=${LIBRARY:-"${PREFIX}/lib"} |
280 |
- MANDIR=${MANDIR:-"${PREFIX}/share/man"} |
281 |
--GZIP=${GZIP:-"gzip -c"} |
282 |
-+GZIP=${GZIP-"gzip -c"} |
283 |
- POINTER_PACK_ENABLE=${POINTER_PACK_ENABLE:-"CK_MD_POINTER_PACK_DISABLE"} |
284 |
- DISABLE_DOUBLE=${DISABLE_DOUBLE:-"CK_PR_ENABLE_DOUBLE"} |
285 |
- PPC32_LWSYNC_ENABLE=${PPC32_LWSYNC_ENABLE:-"CK_MD_PPC32_LWSYNC_DISABLE"} |
286 |
-@@ -583,21 +583,26 @@ else |
287 |
- echo "success [$BUILD_DIR]" |
288 |
- fi |
289 |
- |
290 |
--printf "Finding gzip tool................" |
291 |
--GZIP=`pathsearch "${GZIP:-gzip}"` |
292 |
--if test -z "$GZIP" -o ! -x "$GZIP"; then |
293 |
-+if test -n "$GZIP"; then |
294 |
-+ printf "Finding gzip tool................" |
295 |
- GZIP=`pathsearch "${GZIP:-gzip}"` |
296 |
-- GZIP="$GZIP" |
297 |
-+ if test -z "$GZIP" -o ! -x "$GZIP"; then |
298 |
-+ GZIP=`pathsearch "${GZIP:-gzip}"` |
299 |
-+ GZIP="$GZIP" |
300 |
-+ fi |
301 |
-+ |
302 |
-+ if test -z "$GZIP"; then |
303 |
-+ echo "not found" |
304 |
-+ else |
305 |
-+ echo "success [$GZIP]" |
306 |
-+ GZIP="$GZIP -c" |
307 |
-+ GZIP_SUFFIX=".gz" |
308 |
-+ fi |
309 |
- fi |
310 |
- |
311 |
- if test -z "$GZIP"; then |
312 |
-- echo "not found" |
313 |
- GZIP=cat |
314 |
- GZIP_SUFFIX="" |
315 |
--else |
316 |
-- echo "success [$GZIP]" |
317 |
-- GZIP="$GZIP -c" |
318 |
-- GZIP_SUFFIX=".gz" |
319 |
- fi |
320 |
- |
321 |
- printf "Finding suitable compiler........" |
322 |
|
323 |
diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-static-libs.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-static-libs.patch |
324 |
deleted file mode 100644 |
325 |
index 3e1d080a5f4..00000000000 |
326 |
--- a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-static-libs.patch |
327 |
+++ /dev/null |
328 |
@@ -1,75 +0,0 @@ |
329 |
-diff --git a/configure b/configure |
330 |
-index 7853533..4e1ee9d 100755 |
331 |
---- a/configure |
332 |
-+++ b/configure |
333 |
-@@ -119,6 +119,7 @@ generate() |
334 |
- -e "s#@GZIP_SUFFIX@#$GZIP_SUFFIX#g" \ |
335 |
- -e "s#@POINTER_PACK_ENABLE@#$POINTER_PACK_ENABLE#g" \ |
336 |
- -e "s#@DISABLE_DOUBLE@#$DISABLE_DOUBLE#g" \ |
337 |
-+ -e "s#@DISABLE_STATIC@#$DISABLE_STATIC#g" \ |
338 |
- -e "s#@SSE_DISABLE@#$SSE_DISABLE#g" \ |
339 |
- -e "s#@PPC32_LWSYNC_ENABLE@#$PPC32_LWSYNC_ENABLE#g" \ |
340 |
- -e "s#@RTM_ENABLE@#$RTM_ENABLE#g" \ |
341 |
-@@ -156,6 +157,7 @@ generate_stdout() |
342 |
- echo " LDNAME_VERSION = $LDNAME_VERSION" |
343 |
- echo " LDNAME_MAJOR = $LDNAME_MAJOR" |
344 |
- echo " LDFLAGS = $LDFLAGS" |
345 |
-+ echo " STATIC_LIB = $DISABLE_STATIC" |
346 |
- echo " GZIP = $GZIP" |
347 |
- echo " CORES = $CORES" |
348 |
- echo " POINTER_PACK = $POINTER_PACK_ENABLE" |
349 |
-@@ -205,6 +207,7 @@ for option; do |
350 |
- echo " --platform=N Force the platform type, instead of relying on autodetection" |
351 |
- echo " --use-cc-builtins Use the compiler atomic builtin functions, instead of the CK implementation" |
352 |
- echo " --disable-double Don't generate any of the functions using the \"double\" type" |
353 |
-+ echo " --disable-static Don't compile a static version of the ck lib" |
354 |
- echo |
355 |
- echo "The following options will affect specific platform-dependent generated code." |
356 |
- echo " --disable-sse Do not use any SSE instructions (x86)" |
357 |
-@@ -293,6 +296,9 @@ for option; do |
358 |
- --disable-double) |
359 |
- DISABLE_DOUBLE="CK_PR_DISABLE_DOUBLE" |
360 |
- ;; |
361 |
-+ --disable-static) |
362 |
-+ DISABLE_STATIC=1 |
363 |
-+ ;; |
364 |
- --platform=*) |
365 |
- PLATFORM=$value |
366 |
- ;; |
367 |
-@@ -330,6 +336,7 @@ MANDIR=${MANDIR:-"${PREFIX}/share/man"} |
368 |
- GZIP=${GZIP-"gzip -c"} |
369 |
- POINTER_PACK_ENABLE=${POINTER_PACK_ENABLE:-"CK_MD_POINTER_PACK_DISABLE"} |
370 |
- DISABLE_DOUBLE=${DISABLE_DOUBLE:-"CK_PR_ENABLE_DOUBLE"} |
371 |
-+DISABLE_STATIC=${DISABLE_STATIC:-"0"} |
372 |
- PPC32_LWSYNC_ENABLE=${PPC32_LWSYNC_ENABLE:-"CK_MD_PPC32_LWSYNC_DISABLE"} |
373 |
- RTM_ENABLE=${RTM_ENABLE_SET:-"CK_MD_RTM_DISABLE"} |
374 |
- SSE_DISABLE=${SSE_DISABLE:-"CK_MD_SSE_ENABLE"} |
375 |
-@@ -717,13 +724,24 @@ elif test "$COMPILER" = "gcc" || test "$COMPILER" = "clang" || test "$COMPILER" |
376 |
- if test "$WANT_PIC" = "yes"; then |
377 |
- LDFLAGS="$LDFLAGS -shared -fPIC" |
378 |
- CFLAGS="$CFLAGS -fPIC" |
379 |
-- ALL_LIBS="libck.so libck.a" |
380 |
-- INSTALL_LIBS="install-so install-lib" |
381 |
-+ |
382 |
-+ if [ "$DISABLE_STATIC" -eq 1 ]; then |
383 |
-+ ALL_LIBS="libck.so" |
384 |
-+ INSTALL_LIBS="install-so" |
385 |
-+ else |
386 |
-+ ALL_LIBS="libck.so libck.a" |
387 |
-+ INSTALL_LIBS="install-so install-lib" |
388 |
-+ fi |
389 |
- else |
390 |
- LDFLAGS="$LDFLAGS -fno-PIC" |
391 |
- CFLAGS="$CFLAGS -fno-PIC" |
392 |
-- ALL_LIBS="libck.a" |
393 |
-- INSTALL_LIBS="install-lib" |
394 |
-+ if [ "$DISABLE_STATIC" -eq 1 ]; then |
395 |
-+ echo "Error: You have choosen to disable PIC, yet you also disabled the static lib." 1>&2 |
396 |
-+ exit $EXIT_FAILURE |
397 |
-+ else |
398 |
-+ ALL_LIBS="libck.a" |
399 |
-+ INSTALL_LIBS="install-lib" |
400 |
-+ fi |
401 |
- fi |
402 |
- |
403 |
- CFLAGS="-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -std=gnu99 -pedantic -Wall -W -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wdisabled-optimization -fstrict-aliasing -O2 -pipe -Wno-parentheses $CFLAGS" |
404 |
|
405 |
diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-tests.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-tests.patch |
406 |
deleted file mode 100644 |
407 |
index 4d29c6bcf7e..00000000000 |
408 |
--- a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-tests.patch |
409 |
+++ /dev/null |
410 |
@@ -1,33 +0,0 @@ |
411 |
-From 07835a3d08d96db30393c235f95649e792883d50 Mon Sep 17 00:00:00 2001 |
412 |
-From: Samy Al Bahra <sbahra@×××××××××.io> |
413 |
-Date: Mon, 30 Nov 2020 18:33:51 -0500 |
414 |
-Subject: [PATCH] regressions/ck_hp_fifo: fixes false-positive from #165. |
415 |
- |
416 |
-Add busy-wait barrier before next stage of test. Otherwise, |
417 |
-some threads may enter it and a non-empty queue state is observed. |
418 |
---- |
419 |
- regressions/ck_hp/validate/ck_hp_fifo.c | 4 ++++ |
420 |
- 1 file changed, 4 insertions(+) |
421 |
- |
422 |
-diff --git a/regressions/ck_hp/validate/ck_hp_fifo.c b/regressions/ck_hp/validate/ck_hp_fifo.c |
423 |
-index 4454283c..5820f1aa 100644 |
424 |
---- a/regressions/ck_hp/validate/ck_hp_fifo.c |
425 |
-+++ b/regressions/ck_hp/validate/ck_hp_fifo.c |
426 |
-@@ -55,6 +55,7 @@ static struct affinity a; |
427 |
- static int size; |
428 |
- static unsigned int barrier; |
429 |
- static unsigned int e_barrier; |
430 |
-+static unsigned int s_barrier; |
431 |
- |
432 |
- static void * |
433 |
- test(void *c) |
434 |
-@@ -98,6 +99,9 @@ test(void *c) |
435 |
- } |
436 |
- } |
437 |
- |
438 |
-+ ck_pr_inc_uint(&s_barrier); |
439 |
-+ while (ck_pr_load_uint(&s_barrier) < (unsigned int)nthr); |
440 |
-+ |
441 |
- for (i = 0; i < ITERATIONS; i++) { |
442 |
- for (j = 0; j < size; j++) { |
443 |
- fifo_entry = malloc(sizeof(ck_hp_fifo_entry_t)); |