From 2eb3803f004222e2f284ec27f71683b3b3c135b7 Mon Sep 17 00:00:00 2001 From: Conrad Kostecki Date: Thu, 1 Jul 2021 23:26:26 +0200 Subject: dev-libs/concurrencykit: drop old version Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Conrad Kostecki --- dev-libs/concurrencykit/Manifest | 1 - .../concurrencykit/concurrencykit-0.7.0-r1.ebuild | 41 -------- .../files/concurrencykit-0.7.0-ar.patch | 112 --------------------- .../files/concurrencykit-0.7.0-glibc-2.30.patch | 54 ---------- .../files/concurrencykit-0.7.0-gzip.patch | 58 ----------- .../files/concurrencykit-0.7.0-static-libs.patch | 75 -------------- .../files/concurrencykit-0.7.0-tests.patch | 33 ------ 7 files changed, 374 deletions(-) delete mode 100644 dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild delete mode 100644 dev-libs/concurrencykit/files/concurrencykit-0.7.0-ar.patch delete mode 100644 dev-libs/concurrencykit/files/concurrencykit-0.7.0-glibc-2.30.patch delete mode 100644 dev-libs/concurrencykit/files/concurrencykit-0.7.0-gzip.patch delete mode 100644 dev-libs/concurrencykit/files/concurrencykit-0.7.0-static-libs.patch delete mode 100644 dev-libs/concurrencykit/files/concurrencykit-0.7.0-tests.patch diff --git a/dev-libs/concurrencykit/Manifest b/dev-libs/concurrencykit/Manifest index 30c95878f4cd..c4ba83f50e5e 100644 --- a/dev-libs/concurrencykit/Manifest +++ b/dev-libs/concurrencykit/Manifest @@ -1,2 +1 @@ -DIST concurrencykit-0.7.0.tar.gz 245574 BLAKE2B 14c386eb35c76297933d2935cdfc1cb0d21071d4fe1784eeb27595c2e75a8edc5add349df6795d03372b30711cda4deeb7957bdcfd7e62ba89b254fb41ba6a55 SHA512 509fe5bc1575a6fd646d30fbcd74204ba4683092f154dc1fb55ed6fc17e734e17759bacfc3f42344db4c243ca6b239f7d207cf2ebc609e2a37d7ddfd1bdcc3a1 DIST concurrencykit-0.7.1.tar.gz 252802 BLAKE2B 907db3b244544a9c46db7432f2c3d07c20652882067157974ce54c71c27f21fdc87d41e068efc71f88392a94895e0de1a8f3ae90605b4267606cfa7d29c7dc35 SHA512 48768e7adf05b818f2951b246c90185071d6c3f874218349183d96b7887830f9505f9fa58576e9933862486e8543097df0ee667518009a3946d1edc19fc253f7 diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild deleted file mode 100644 index fb0bfdf85639..000000000000 --- a/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_PN="ck" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A library with concurrency related algorithms and data structures in C" -HOMEPAGE="http://concurrencykit.org" -SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="Apache-2.0 BSD-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" - -# The 'libck.so' has a name collision. -# See #616762 for more information. -RDEPEND="!sys-cluster/charm" - -PATCHES=( - "${FILESDIR}/${P}-ar.patch" - "${FILESDIR}/${P}-glibc-2.30.patch" - "${FILESDIR}/${P}-gzip.patch" - "${FILESDIR}/${P}-static-libs.patch" - "${FILESDIR}/${P}-tests.patch" -) - -src_configure() { - tc-export AR CC LD - $(usex x86 'export PROFILE=x86' '') - - local myeconfargs=( - "--disable-static" - ) - - GZIP="" econf ${myeconfargs[@]} -} diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-ar.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-ar.patch deleted file mode 100644 index 70dd46a113f2..000000000000 --- a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-ar.patch +++ /dev/null @@ -1,112 +0,0 @@ -From c6a2f41369bb4549bfaadf1120ccacd884b0b70f Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki -Date: Sun, 22 Nov 2020 00:55:36 +0100 -Subject: [PATCH] Add support for setting AR - -By default, the command 'ar' is called. Is should be possible, as with -'CC', to override that value and set an own AR. - -Signed-off-by: Conrad Kostecki ---- - configure | 11 +++++++++++ - src/Makefile.in | 2 +- - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index 1b85d113..78535332 100755 ---- a/configure -+++ b/configure -@@ -146,6 +146,7 @@ generate_stdout() - echo " SRC_DIR = $BUILD_DIR" - echo " SYSTEM = $SYSTEM" - echo " PROFILE = $PROFILE" -+ echo " AR = $AR" - echo " CC = $CC" - echo " COMPILER = $COMPILER" - echo " CFLAGS = $CFLAGS" -@@ -215,6 +216,7 @@ for option; do - echo " --cores=N Specify number of cores available on target machine" - echo - echo "The following environment variables may be used:" -+ echo " AR AR archiver command" - echo " CC C compiler command" - echo " CFLAGS C compiler flags" - echo " LDFLAGS Linker flags" -@@ -645,6 +647,15 @@ if test ! -x "${CC}"; then - fi - assert "$CC" "not found" - -+printf "Finding suitable archiver........" -+if test ! -x "${AR}"; then -+ AR=`pathsearch "${AR:-ar}"` -+ if test -z "$AR" -o ! -x "$AR"; then -+ AR=`pathsearch "${AR:-ar}"` -+ fi -+fi -+assert "$AR" "not found" -+ - cat << EOF > .1.c - #include - int main(void) { -diff --git a/src/Makefile.in b/src/Makefile.in -index 0b7ae7b6..73788497 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -25,7 +25,7 @@ libck.so: $(OBJECTS) - $(LD) $(LDFLAGS) -o $(TARGET_DIR)/libck.so $(OBJECTS) - - libck.a: $(OBJECTS) -- ar rcs $(TARGET_DIR)/libck.a $(OBJECTS) -+ $(AR) rcs $(TARGET_DIR)/libck.a $(OBJECTS) - - ck_array.o: $(INCLUDE_DIR)/ck_array.h $(SDIR)/ck_array.c - $(CC) $(CFLAGS) -c -o $(TARGET_DIR)/ck_array.o $(SDIR)/ck_array.c -From 866c2af332a075cc83af78b184be0d5e6152de13 Mon Sep 17 00:00:00 2001 -From: Olivier Houchard -Date: Sun, 22 Nov 2020 01:16:10 +0100 -Subject: [PATCH] build: Make the lookup for an archiver report success. - -Move the code looking for ar outside the compiler checking code, and make -it report success if found. ---- - configure | 20 +++++++++++--------- - 1 file changed, 11 insertions(+), 9 deletions(-) - -diff --git a/configure b/configure -index 78535332..16a8f64f 100755 ---- a/configure -+++ b/configure -@@ -647,15 +647,6 @@ if test ! -x "${CC}"; then - fi - assert "$CC" "not found" - --printf "Finding suitable archiver........" --if test ! -x "${AR}"; then -- AR=`pathsearch "${AR:-ar}"` -- if test -z "$AR" -o ! -x "$AR"; then -- AR=`pathsearch "${AR:-ar}"` -- fi --fi --assert "$AR" "not found" -- - cat << EOF > .1.c - #include - int main(void) { -@@ -736,6 +727,17 @@ else - assert "" "unknown compiler" - fi - -+printf "Finding suitable archiver........" -+if test ! -x "${AR}"; then -+ AR=`pathsearch "${AR:-ar}"` -+ if test -z "$AR" -o ! -x "$AR"; then -+ AR=`pathsearch "${AR:-ar}"` -+ else -+ echo "success [$AR]" -+ fi -+fi -+assert "$AR" "not found" -+ - printf "Detecting VMA bits..............." - VMA="unknown" - if test "$VMA_BITS" = "unknown"; then 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 deleted file mode 100644 index 77e63e3de7ef..000000000000 --- a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-glibc-2.30.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b520d58d00b7ed6c5cc9bc97c62f07e09f4f49ad Mon Sep 17 00:00:00 2001 -From: Samy Al Bahra -Date: Tue, 29 Oct 2019 17:30:09 -0400 -Subject: [PATCH] regressions/common: rename gettid wrapper to common_gettid. - -glibc-2.30 added a wrapper to gettid (https://lwn.net/Articles/795127/). -gettid will clash with the glibc-provided symbol. Remove the -macro and instead move to a dedicated namespace. - -We go this route to avoid introducing unnecessary complexity to -build. - -Fixes #147 ---- - regressions/common.h | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/regressions/common.h b/regressions/common.h -index 6e53483d..9cdc690a 100644 ---- a/regressions/common.h -+++ b/regressions/common.h -@@ -267,13 +267,11 @@ struct affinity { - #define AFFINITY_INITIALIZER {0, 0} - - #ifdef __linux__ --#ifndef gettid - static pid_t --gettid(void) -+common_gettid(void) - { - return syscall(__NR_gettid); - } --#endif /* gettid */ - - CK_CC_UNUSED static int - aff_iterate(struct affinity *acb) -@@ -285,7 +283,7 @@ aff_iterate(struct affinity *acb) - CPU_ZERO(&s); - CPU_SET(c % CORES, &s); - -- if (sched_setaffinity(gettid(), sizeof(s), &s) != 0) -+ if (sched_setaffinity(common_gettid(), sizeof(s), &s) != 0) - perror("WARNING: Could not affine thread"); - - return 0; -@@ -300,7 +298,7 @@ aff_iterate_core(struct affinity *acb, unsigned int *core) - CPU_ZERO(&s); - CPU_SET((*core) % CORES, &s); - -- if (sched_setaffinity(gettid(), sizeof(s), &s) != 0) -+ if (sched_setaffinity(common_gettid(), sizeof(s), &s) != 0) - perror("WARNING: Could not affine thread"); - - return 0; diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-gzip.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-gzip.patch deleted file mode 100644 index 62477f9acf6c..000000000000 --- a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-gzip.patch +++ /dev/null @@ -1,58 +0,0 @@ -From cb63256ae2e5fde7a67d7740bb2f4a0eab538a2d Mon Sep 17 00:00:00 2001 -From: Samy Al Bahra -Date: Thu, 9 Apr 2020 20:08:40 -0400 -Subject: [PATCH] build: allow GZIP to be set to empty string in configure. - ---- - configure | 25 +++++++++++++++---------- - 1 file changed, 15 insertions(+), 10 deletions(-) - -diff --git a/configure b/configure -index 2cbdbef3..ed188f96 100755 ---- a/configure -+++ b/configure -@@ -325,7 +325,7 @@ done - HEADERS=${HEADERS:-"${PREFIX}/include"} - LIBRARY=${LIBRARY:-"${PREFIX}/lib"} - MANDIR=${MANDIR:-"${PREFIX}/share/man"} --GZIP=${GZIP:-"gzip -c"} -+GZIP=${GZIP-"gzip -c"} - POINTER_PACK_ENABLE=${POINTER_PACK_ENABLE:-"CK_MD_POINTER_PACK_DISABLE"} - DISABLE_DOUBLE=${DISABLE_DOUBLE:-"CK_PR_ENABLE_DOUBLE"} - PPC32_LWSYNC_ENABLE=${PPC32_LWSYNC_ENABLE:-"CK_MD_PPC32_LWSYNC_DISABLE"} -@@ -583,21 +583,26 @@ else - echo "success [$BUILD_DIR]" - fi - --printf "Finding gzip tool................" --GZIP=`pathsearch "${GZIP:-gzip}"` --if test -z "$GZIP" -o ! -x "$GZIP"; then -+if test -n "$GZIP"; then -+ printf "Finding gzip tool................" - GZIP=`pathsearch "${GZIP:-gzip}"` -- GZIP="$GZIP" -+ if test -z "$GZIP" -o ! -x "$GZIP"; then -+ GZIP=`pathsearch "${GZIP:-gzip}"` -+ GZIP="$GZIP" -+ fi -+ -+ if test -z "$GZIP"; then -+ echo "not found" -+ else -+ echo "success [$GZIP]" -+ GZIP="$GZIP -c" -+ GZIP_SUFFIX=".gz" -+ fi - fi - - if test -z "$GZIP"; then -- echo "not found" - GZIP=cat - GZIP_SUFFIX="" --else -- echo "success [$GZIP]" -- GZIP="$GZIP -c" -- GZIP_SUFFIX=".gz" - fi - - printf "Finding suitable compiler........" 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 deleted file mode 100644 index 3e1d080a5f4d..000000000000 --- a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-static-libs.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/configure b/configure -index 7853533..4e1ee9d 100755 ---- a/configure -+++ b/configure -@@ -119,6 +119,7 @@ generate() - -e "s#@GZIP_SUFFIX@#$GZIP_SUFFIX#g" \ - -e "s#@POINTER_PACK_ENABLE@#$POINTER_PACK_ENABLE#g" \ - -e "s#@DISABLE_DOUBLE@#$DISABLE_DOUBLE#g" \ -+ -e "s#@DISABLE_STATIC@#$DISABLE_STATIC#g" \ - -e "s#@SSE_DISABLE@#$SSE_DISABLE#g" \ - -e "s#@PPC32_LWSYNC_ENABLE@#$PPC32_LWSYNC_ENABLE#g" \ - -e "s#@RTM_ENABLE@#$RTM_ENABLE#g" \ -@@ -156,6 +157,7 @@ generate_stdout() - echo " LDNAME_VERSION = $LDNAME_VERSION" - echo " LDNAME_MAJOR = $LDNAME_MAJOR" - echo " LDFLAGS = $LDFLAGS" -+ echo " STATIC_LIB = $DISABLE_STATIC" - echo " GZIP = $GZIP" - echo " CORES = $CORES" - echo " POINTER_PACK = $POINTER_PACK_ENABLE" -@@ -205,6 +207,7 @@ for option; do - echo " --platform=N Force the platform type, instead of relying on autodetection" - echo " --use-cc-builtins Use the compiler atomic builtin functions, instead of the CK implementation" - echo " --disable-double Don't generate any of the functions using the \"double\" type" -+ echo " --disable-static Don't compile a static version of the ck lib" - echo - echo "The following options will affect specific platform-dependent generated code." - echo " --disable-sse Do not use any SSE instructions (x86)" -@@ -293,6 +296,9 @@ for option; do - --disable-double) - DISABLE_DOUBLE="CK_PR_DISABLE_DOUBLE" - ;; -+ --disable-static) -+ DISABLE_STATIC=1 -+ ;; - --platform=*) - PLATFORM=$value - ;; -@@ -330,6 +336,7 @@ MANDIR=${MANDIR:-"${PREFIX}/share/man"} - GZIP=${GZIP-"gzip -c"} - POINTER_PACK_ENABLE=${POINTER_PACK_ENABLE:-"CK_MD_POINTER_PACK_DISABLE"} - DISABLE_DOUBLE=${DISABLE_DOUBLE:-"CK_PR_ENABLE_DOUBLE"} -+DISABLE_STATIC=${DISABLE_STATIC:-"0"} - PPC32_LWSYNC_ENABLE=${PPC32_LWSYNC_ENABLE:-"CK_MD_PPC32_LWSYNC_DISABLE"} - RTM_ENABLE=${RTM_ENABLE_SET:-"CK_MD_RTM_DISABLE"} - SSE_DISABLE=${SSE_DISABLE:-"CK_MD_SSE_ENABLE"} -@@ -717,13 +724,24 @@ elif test "$COMPILER" = "gcc" || test "$COMPILER" = "clang" || test "$COMPILER" - if test "$WANT_PIC" = "yes"; then - LDFLAGS="$LDFLAGS -shared -fPIC" - CFLAGS="$CFLAGS -fPIC" -- ALL_LIBS="libck.so libck.a" -- INSTALL_LIBS="install-so install-lib" -+ -+ if [ "$DISABLE_STATIC" -eq 1 ]; then -+ ALL_LIBS="libck.so" -+ INSTALL_LIBS="install-so" -+ else -+ ALL_LIBS="libck.so libck.a" -+ INSTALL_LIBS="install-so install-lib" -+ fi - else - LDFLAGS="$LDFLAGS -fno-PIC" - CFLAGS="$CFLAGS -fno-PIC" -- ALL_LIBS="libck.a" -- INSTALL_LIBS="install-lib" -+ if [ "$DISABLE_STATIC" -eq 1 ]; then -+ echo "Error: You have choosen to disable PIC, yet you also disabled the static lib." 1>&2 -+ exit $EXIT_FAILURE -+ else -+ ALL_LIBS="libck.a" -+ INSTALL_LIBS="install-lib" -+ fi - fi - - 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" diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-tests.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-tests.patch deleted file mode 100644 index 4d29c6bcf7eb..000000000000 --- a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-tests.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 07835a3d08d96db30393c235f95649e792883d50 Mon Sep 17 00:00:00 2001 -From: Samy Al Bahra -Date: Mon, 30 Nov 2020 18:33:51 -0500 -Subject: [PATCH] regressions/ck_hp_fifo: fixes false-positive from #165. - -Add busy-wait barrier before next stage of test. Otherwise, -some threads may enter it and a non-empty queue state is observed. ---- - regressions/ck_hp/validate/ck_hp_fifo.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/regressions/ck_hp/validate/ck_hp_fifo.c b/regressions/ck_hp/validate/ck_hp_fifo.c -index 4454283c..5820f1aa 100644 ---- a/regressions/ck_hp/validate/ck_hp_fifo.c -+++ b/regressions/ck_hp/validate/ck_hp_fifo.c -@@ -55,6 +55,7 @@ static struct affinity a; - static int size; - static unsigned int barrier; - static unsigned int e_barrier; -+static unsigned int s_barrier; - - static void * - test(void *c) -@@ -98,6 +99,9 @@ test(void *c) - } - } - -+ ck_pr_inc_uint(&s_barrier); -+ while (ck_pr_load_uint(&s_barrier) < (unsigned int)nthr); -+ - for (i = 0; i < ITERATIONS; i++) { - for (j = 0; j < size; j++) { - fifo_entry = malloc(sizeof(ck_hp_fifo_entry_t)); -- cgit v1.2.3-65-gdbad