From 6d44cd74809cea5f81bf52ff9cd0aa902d6b6866 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Dec 2022 21:14:14 +0000 Subject: gentoo auto-resync : 07:12:2022 - 21:14:14 --- dev-libs/zthread/Manifest | 3 +- .../files/zthread-2.3.2-configure-clang16.patch | 22 ++++++++ dev-libs/zthread/zthread-2.3.2-r4.ebuild | 65 ---------------------- dev-libs/zthread/zthread-2.3.2-r5.ebuild | 65 ++++++++++++++++++++++ 4 files changed, 89 insertions(+), 66 deletions(-) create mode 100644 dev-libs/zthread/files/zthread-2.3.2-configure-clang16.patch delete mode 100644 dev-libs/zthread/zthread-2.3.2-r4.ebuild create mode 100644 dev-libs/zthread/zthread-2.3.2-r5.ebuild (limited to 'dev-libs/zthread') diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest index ae4747dff8a0..9d585abf1b2d 100644 --- a/dev-libs/zthread/Manifest +++ b/dev-libs/zthread/Manifest @@ -1,8 +1,9 @@ AUX zthread-2.3.2-automake-r2.patch 2383 BLAKE2B 7368559120cd6e3b3a891178eeae15dcb6e3b3705da16ae8cf913aa3d83f01ddc7771e3a4ff416a02bd26006ecb123ce00af6c2d66fe92699c425bdbfee87aec SHA512 dae4fad0d560e8681db8e212888a4976abb67fc8ce85a85cd56d743f7ebcefd2760e91de40a83bd9023173d90f10bdf731b501ad50c09a5e769de6080b9bbad6 AUX zthread-2.3.2-clang.patch 454 BLAKE2B 6c3ef1abdcf9c0b71e0eebf733366d46aa6a969fd26f054c024c7a59eb0d8ade0a8116aaa004c770e6dd19873e8227ed791388b5779e9eac91ec2fe3e12128af SHA512 0886849336517b76f524d08462e2604b2cd67203c4b2ded910df01aecf2ab3c451c9433001b655dcf0cdd7256fe88c32a81d1b0050866930121f7bbf2e742c29 +AUX zthread-2.3.2-configure-clang16.patch 834 BLAKE2B 504f659336349502604daf5c1b3960d21e5a6d07532e5d31547e9bdd0430eda6b056b13b5c29d568dabe3ce0a278482ad02206c4a732e9ab228be20d2d33a81d SHA512 2d4b06b451c40a6eb336ea8d13c3daa98dc75f4f3b4e8b1d5d08fe1af4aa864077f46eadc31661cccf60bb421272736f7f0fd5cd7b71ef6695134446266d2642 AUX zthread-2.3.2-gcc47.patch 704 BLAKE2B 14031fe0230ba0abff034b894ddfe0e7c4178c65dbef4a2a74f9de164d3ac0d314912210a42a25beedaad098d34d8b03a59a51a7dde4567bf58562fe04743a3a SHA512 2c90bcb07a7063380b1f9f405467cf3d256ae0265d88886483612e7b11ded40a9dc810a9f11a36f2a40e62e30f98c36344b0f002b351980745d0562c1ca81a6b AUX zthread-2.3.2-m4-quote.patch 554 BLAKE2B b6c4293796b385d60f8011b3ee1c0436bfec773f40742159dc31eb4c07dd08c5bc0c474664712c6ef5e9a3b5a284dc17866f7f25591c67881f788a6ce7d7d2b4 SHA512 0f1b82ed3955174b16927e36a7dfc549d7cb6243f3a0cd2699a2f3c53fad5cd554140401d59dafd6f5ee4ce4fb689407ccf96ae9d5b9dc4a72a83157583b3381 AUX zthread-2.3.2-no-fpermissive-r1.diff 1864 BLAKE2B 1975e3e1e5c4202105bec905d5ede43102b347e5c0c17e8922f6be0839ec27f92aa945792c018c6ce86fdf0f8ff6794bf6d7676ad3abdd5d57786be016d91f60 SHA512 f32f76ba5e6063b96b80b4da3bb57dea61cd65c589ede3c93f7d06bbbfcd03c616eef98c9874e91ad85cc89163b9ead3d657aa753e564707204d6ea1a19793b6 DIST ZThread-2.3.2.tar.gz 412527 BLAKE2B f8b176a35ca2df21460825f4cf9406a0e0fdd0a320eca2ffa323c47f025fa76e087bc30e3f6f2dc061cd79b0346c023f736f5fa2d1b0829eef718197c4e50e67 SHA512 e17e12746d16f32f6f1dc8ec041795f3c05a541c015b9579252599b51de9f97dc780946e6e83b41ca78d1af892455e6f00169a089f6e1a7c3196d6a4f49a7f7b -EBUILD zthread-2.3.2-r4.ebuild 1373 BLAKE2B de793a15536d7d384213fafe29b8ff0ccb31dd36b5a7fe51df15e990a1f69d73d75d31460a15b0201bb733eb790c02cad673afe5b9e088217f2087b4c930c154 SHA512 15d536ce4277f0ef7c5f3a3d3662e10e7cd9e26428a636f8f2ae34c8dd1ec921e6366d228224b60c46a2188034025ec531b65a60d7794fcb64b5a8df64cea538 +EBUILD zthread-2.3.2-r5.ebuild 1396 BLAKE2B 770c6130756e94266fad7538ceae9f732cde33d68266ad86e3f1b8c3a570f5f18a7c62b5ca90063f686fe23fbd5bce0fe61a1427cea0993aee83c83d5e431ee3 SHA512 1c80f4fee496aa5b90059628141dd76838d69757de1d78cc3ae0e3618df722345a7da16795735bc46583f429c6adc062e488cbd4570241d21bbbd0f51e7e43e9 MISC metadata.xml 245 BLAKE2B b66c6e72caaefaebdbc5f4d231649009c4c9766419d892360c66d300f464f3a4fc069cc5691d868fcad5787da921f87d92026d71aa42acb45393846280cbd249 SHA512 e41c2c161da6f2622c302f76323d8ffcf98413165133eedc5e01ca27002e6f958c50b5b517ff3c203c5ae06a9f983db33f7ff3ffc789f5434b92a04c169adcfd diff --git a/dev-libs/zthread/files/zthread-2.3.2-configure-clang16.patch b/dev-libs/zthread/files/zthread-2.3.2-configure-clang16.patch new file mode 100644 index 000000000000..998dc36c2976 --- /dev/null +++ b/dev-libs/zthread/files/zthread-2.3.2-configure-clang16.patch @@ -0,0 +1,22 @@ +pthread_yield needs GNU_SOURCE (missing in the test here), but pthread_yield +is both deprecated and also not actually used (even conditionally!) in zthread, +so let's just drop the test. + +(zthread uses sched_yield conditionally, however.) +--- a/share/pthread.m4 ++++ b/share/pthread.m4 +@@ -128,14 +128,6 @@ pthread_explicit="no" + AC_DEFINE(HAVE_SCHED_YIELD,,[Defined if sched_yield() is available]) ], + [ AC_MSG_RESULT(no) ]) + +- dnl Check for pthread_yield +- AC_MSG_CHECKING(for pthread_yield); +- AC_TRY_LINK([#include ], +- [ pthread_yield(); ], +- [ AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_PTHREAD_YIELD,,[Defined if pthread_yield() is available]) ], +- [ AC_MSG_RESULT(no) ]) +- + dnl Check for pthread_key_create + AC_MSG_CHECKING(for pthread_key_create) + AC_TRY_LINK([#include ], diff --git a/dev-libs/zthread/zthread-2.3.2-r4.ebuild b/dev-libs/zthread/zthread-2.3.2-r4.ebuild deleted file mode 100644 index 96e7f7294154..000000000000 --- a/dev-libs/zthread/zthread-2.3.2-r4.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -MY_P="ZThread-${PV}" - -DESCRIPTION="platform-independent multi-threading and synchronization library for C++" -HOMEPAGE="http://zthread.sourceforge.net/" -SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm64 ~hppa ~mips ppc ~sparc x86" -IUSE="debug doc" - -BDEPEND="doc? ( app-doc/doxygen )" - -PATCHES=( - "${FILESDIR}"/${P}-no-fpermissive-r1.diff - "${FILESDIR}"/${P}-m4-quote.patch - "${FILESDIR}"/${P}-automake-r2.patch - "${FILESDIR}"/${P}-gcc47.patch - "${FILESDIR}"/${P}-clang.patch -) - -src_prepare() { - default - - rm -f include/zthread/{.Barrier.h.swp,Barrier.h.orig} || die - - # bug #467778 - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die - - AT_M4DIR="share" eautoreconf -} - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable kernel_linux atomic-linux) \ - --disable-static -} - -src_compile() { - default - - if use doc; then - doxygen doc/zthread.doxygen || die - sed -i -e 's|href="html/|href="|' doc/documentation.html || die - cp doc/documentation.html doc/html/index.html || die - cp doc/{zthread.css,bugs.js} doc/html/ || die - fi -} - -src_install() { - default - - use doc && dodoc -r doc/html - - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/zthread/zthread-2.3.2-r5.ebuild b/dev-libs/zthread/zthread-2.3.2-r5.ebuild new file mode 100644 index 000000000000..87af37d2ba8d --- /dev/null +++ b/dev-libs/zthread/zthread-2.3.2-r5.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_P="ZThread-${PV}" + +DESCRIPTION="platform-independent multi-threading and synchronization library for C++" +HOMEPAGE="http://zthread.sourceforge.net/" +SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm64 ~hppa ~mips ppc ~sparc x86" +IUSE="debug doc" + +BDEPEND="doc? ( app-doc/doxygen )" + +PATCHES=( + "${FILESDIR}"/${P}-no-fpermissive-r1.diff + "${FILESDIR}"/${P}-m4-quote.patch + "${FILESDIR}"/${P}-automake-r2.patch + "${FILESDIR}"/${P}-gcc47.patch + "${FILESDIR}"/${P}-clang.patch + "${FILESDIR}"/${P}-configure-clang16.patch +) + +src_prepare() { + default + + rm -f include/zthread/{.Barrier.h.swp,Barrier.h.orig} || die + + # bug #467778 + sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die + + AT_M4DIR="share" eautoreconf +} + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable kernel_linux atomic-linux) +} + +src_compile() { + default + + if use doc; then + doxygen doc/zthread.doxygen || die + sed -i -e 's|href="html/|href="|' doc/documentation.html || die + cp doc/documentation.html doc/html/index.html || die + cp doc/{zthread.css,bugs.js} doc/html/ || die + fi +} + +src_install() { + default + + use doc && dodoc -r doc/html + + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3