diff options
Diffstat (limited to 'dev-libs/concurrencykit')
-rw-r--r-- | dev-libs/concurrencykit/Manifest | 6 | ||||
-rw-r--r-- | dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild (renamed from dev-libs/concurrencykit/concurrencykit-0.5.2.ebuild) | 15 | ||||
-rw-r--r-- | dev-libs/concurrencykit/files/concurrencykit-doc.patch | 24 | ||||
-rw-r--r-- | dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch | 37 |
4 files changed, 76 insertions, 6 deletions
diff --git a/dev-libs/concurrencykit/Manifest b/dev-libs/concurrencykit/Manifest index 23d73870b1a1..0c0a31fdb343 100644 --- a/dev-libs/concurrencykit/Manifest +++ b/dev-libs/concurrencykit/Manifest @@ -1,5 +1,7 @@ -DIST concurrencykit-0.5.2.tar.gz 212783 BLAKE2B d2e3f28a21236c83835dda06fb4c6182b4ae1fe9e14c66d01ab9ccd2c94c4487d06fa668039f9d7d980a100e88bae570edf193a6955ece88cc306cc1c05670fd SHA512 69b4f8618a52e53f2b7c2e47a9d52773370ae74c89ca1de70c6dc7567b5a46b3f57dafa82d61a89525807672697e1cd75b83c3be56cd5a80c10b819e9d9d07b0 +AUX concurrencykit-doc.patch 589 BLAKE2B e8812a5d72ba8ee3de915f0c52cf44e55d3e2ae52adeac9b80f4788db80b8c8dbbfdfc11c6199ce19edaa2ecaefe1825d2b9ff656aab1525180f349e5a14994d SHA512 5f07ba35e8b0d6bd70aa234592499648839c53c532ce7755ed7ab463b0e415451a7dbacdccc64dbf57b0efe0f37ae4a49468f7af43801b1daa7074714fe18e3d +AUX concurrencykit-glibc-2.30.patch 1024 BLAKE2B 1e973dfd3b55dde0a187c7b7dc76ee5e374e2ce8bf24028b5b0758c8c62933e566e7c4ac6a9e98a53e7ae7df74856a335e1b7302e3a9bf6f87bc9909f533f1cb SHA512 6702c3c156589c167e36bf81fbd22f7031b95d539c66c700e915018425ce49bffd7aaded210269e4326cd561682e07ae253d13c952bad5eff8832befcc98f82d DIST concurrencykit-0.6.0.tar.gz 217198 BLAKE2B 5ba85bd111c06e7be7af5679227350efe187836e5cb2afc19bff4a8f0fbcd97e9631fad64397b0426e8020a6a0f103a0fbe3bf8f83810eaa8a3a1b429a3e8383 SHA512 4c75f1194a6ad9d3e51a4bad4802cc522df70870135e6e2db1e303d0df89d57e5dc7a73e924de49fe9641b3dcdc81b1a74a26aa7297cd06b7acb5cbf46c402f0 -EBUILD concurrencykit-0.5.2.ebuild 533 BLAKE2B 2d864df0f25e31574f18ba9f1f766c5bc9cbcb68e8733901c7edf09b0b5f989593407e2be44fc6b2a46459a8432ad618890d0e70625718cbeb6a3ed2ba09d97d SHA512 d44cd4c7f56403ce6e142f8b054b2593335527691bbdab1466feccffc8e0aa317ae2f4cd62d3d975a781b557f7289956f4da350299407dadf33e880bc38c520d +DIST concurrencykit-0.7.0.tar.gz 245574 BLAKE2B 14c386eb35c76297933d2935cdfc1cb0d21071d4fe1784eeb27595c2e75a8edc5add349df6795d03372b30711cda4deeb7957bdcfd7e62ba89b254fb41ba6a55 SHA512 509fe5bc1575a6fd646d30fbcd74204ba4683092f154dc1fb55ed6fc17e734e17759bacfc3f42344db4c243ca6b239f7d207cf2ebc609e2a37d7ddfd1bdcc3a1 EBUILD concurrencykit-0.6.0.ebuild 533 BLAKE2B 2d864df0f25e31574f18ba9f1f766c5bc9cbcb68e8733901c7edf09b0b5f989593407e2be44fc6b2a46459a8432ad618890d0e70625718cbeb6a3ed2ba09d97d SHA512 d44cd4c7f56403ce6e142f8b054b2593335527691bbdab1466feccffc8e0aa317ae2f4cd62d3d975a781b557f7289956f4da350299407dadf33e880bc38c520d +EBUILD concurrencykit-0.7.0.ebuild 722 BLAKE2B b415aefe91a091f75f25efac364b4ea4977239a662364c2e3968d57b2a0df7d77d4990b2ae67a85727a70c1352431685d268c114002af2bdacb5c644e4b05173 SHA512 a79060a768ecbad871e36d4285825d7331a424a678d58bf484c07ca388a40c619fd41b07e60c21725c52533b3a4a382a3293f96cb358e4a9998a3be2b231edc2 MISC metadata.xml 449 BLAKE2B 1567c91f6f505bfe5f1b9b737f6dfb02e8ba4ff8dd7ee1c629e314cc6c646c21b9c870d5bd6fae28551bfbeae8901922821f3c2eb1f1351b8733616c613a7fea SHA512 402d971b138335d751d645cd8face4addcda8f351e95bf8a0826b7fdd946c9cf6a22bb0ae274e51f39ee4d56389887856f84a83451040adc12e29d9740982d33 diff --git a/dev-libs/concurrencykit/concurrencykit-0.5.2.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild index 75b0b9bf0c78..1d7428703ed9 100644 --- a/dev-libs/concurrencykit/concurrencykit-0.5.2.ebuild +++ b/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild @@ -1,21 +1,28 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 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="http://concurrencykit.org/releases/${MY_P}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/concurrencykit/ck/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0 BSD-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" # libck.so name collision #616762 # these packages have nothing in common RDEPEND="!sys-cluster/charm" +# https://github.com/concurrencykit/ck/issues/147 +# https://github.com/concurrencykit/ck/issues/150 +PATCHES=( + "${FILESDIR}/${PN}-glibc-2.30.patch" + "${FILESDIR}/${PN}-doc.patch" +) + S="${WORKDIR}/${MY_P}" diff --git a/dev-libs/concurrencykit/files/concurrencykit-doc.patch b/dev-libs/concurrencykit/files/concurrencykit-doc.patch new file mode 100644 index 000000000000..40aa466bb4e6 --- /dev/null +++ b/dev-libs/concurrencykit/files/concurrencykit-doc.patch @@ -0,0 +1,24 @@ +diff --git a/doc/Makefile.in b/doc/Makefile.in +index cbad704..f476925 100644 +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -1,7 +1,7 @@ + .PHONY: clean install uninstall + + MANDIR=@MANDIR@ +-GZIP=@GZIP@ ++GZIP=/bin/echo + GZIP_SUFFIX=.3@GZIP_SUFFIX@ + BUILD_DIR=@BUILD_DIR@ + SRC_DIR=@SRC_DIR@ +@@ -206,7 +206,9 @@ refcheck: + + install: + mkdir -p $(DESTDIR)/$(MANDIR)/man3 || exit +- cp *$(GZIP_SUFFIX) $(DESTDIR)/$(MANDIR)/man3 || exit ++ for target in $(OBJECTS); do \ ++ cp -v $$target $(DESTDIR)/$(MANDIR)/man3/$$target.3 || exit; \ ++ done + + uninstall: + for target in $(OBJECTS); do \ diff --git a/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch b/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch new file mode 100644 index 000000000000..452421c63125 --- /dev/null +++ b/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch @@ -0,0 +1,37 @@ +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; |