diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-04-27 23:59:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-04-27 23:59:43 +0100 |
commit | 413421048cc2b0df9a218f0ab3cb151846809eb5 (patch) | |
tree | 3fd887035aa0f5b65d7f147ab77caa98c44c148d /dev-libs/zthread | |
parent | 3e42d1577189af123b773dc0f11e5419035308c8 (diff) |
gentoo auto-resync : 27:04:2024 - 23:59:42
Diffstat (limited to 'dev-libs/zthread')
-rw-r--r-- | dev-libs/zthread/Manifest | 9 | ||||
-rw-r--r-- | dev-libs/zthread/files/zthread-2.3.2-automake-r2.patch | 75 | ||||
-rw-r--r-- | dev-libs/zthread/files/zthread-2.3.2-clang.patch | 15 | ||||
-rw-r--r-- | dev-libs/zthread/files/zthread-2.3.2-configure-clang16.patch | 22 | ||||
-rw-r--r-- | dev-libs/zthread/files/zthread-2.3.2-gcc47.patch | 25 | ||||
-rw-r--r-- | dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch | 26 | ||||
-rw-r--r-- | dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff | 94 | ||||
-rw-r--r-- | dev-libs/zthread/metadata.xml | 8 | ||||
-rw-r--r-- | dev-libs/zthread/zthread-2.3.2-r5.ebuild | 65 |
9 files changed, 0 insertions, 339 deletions
diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest deleted file mode 100644 index c57c344844db..000000000000 --- a/dev-libs/zthread/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -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-r5.ebuild 1397 BLAKE2B a0183cbc91b124b1977d9c126e3b5e9c5b4fde7e0904c4e481a3a19b52035e53aed2d69ed1b219d2e867c1aff62c018473f59671d98c85c77072562c3d48faf6 SHA512 1c176206343c636e94481f80a4a431d9443719495e838a15784bf18165f255874bb689972efc4ed456d13dd9f0266c4d3c9904b480b538679ad0e2a8426a87d7 -MISC metadata.xml 245 BLAKE2B b66c6e72caaefaebdbc5f4d231649009c4c9766419d892360c66d300f464f3a4fc069cc5691d868fcad5787da921f87d92026d71aa42acb45393846280cbd249 SHA512 e41c2c161da6f2622c302f76323d8ffcf98413165133eedc5e01ca27002e6f958c50b5b517ff3c203c5ae06a9f983db33f7ff3ffc789f5434b92a04c169adcfd diff --git a/dev-libs/zthread/files/zthread-2.3.2-automake-r2.patch b/dev-libs/zthread/files/zthread-2.3.2-automake-r2.patch deleted file mode 100644 index bcd9e0675979..000000000000 --- a/dev-libs/zthread/files/zthread-2.3.2-automake-r2.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 577b34b74b7a73650d906f371044bfaed6e8b74c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch> -Date: Tue, 19 Feb 2013 10:13:12 +0100 -Subject: [PATCH] Use standard automake rules rather than hand coding the - install rules and append linker flags to LDFLAGS and not LDADD, otherwise - --as-needed gets ignored (and possibly others). - ---- - Makefile.am | 21 +++++---------------- - configure.ac | 1 - - src/Makefile.am | 2 -- - 3 files changed, 5 insertions(+), 19 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 6c092cf..2d7bddf 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -24,24 +24,13 @@ LICENSE \ - MIT.TXT \ - depcomp - -+bin_SCRIPTS = share/zthread-config - --## install the config script --install-exec-hook: -- $(mkinstalldirs) $(bindir) -- $(INSTALL_PROGRAM) $(top_srcdir)/share/zthread-config $(bindir) -+aclocaldir = $(datadir)/aclocal -+aclocal_DATA = share/zthread.m4 share/pthread.m4 - --## install the config script & m4 macros --install-data-hook: -- $(mkinstalldirs) $(datadir)/aclocal -- $(INSTALL_DATA) $(top_srcdir)/share/zthread.m4 $(datadir)/aclocal -- $(INSTALL_DATA) $(top_srcdir)/share/pthread.m4 $(datadir)/aclocal -- mkdir -p $(DESTDIR)$(includedir)/zthread -- cp -pR $(top_srcdir)/include/zthread $(DESTDIR)$(includedir)/ -- --## uninstall the config script & m4 macros --uninstall-local: -- -rm -rf $(datadir)/aclocal/pthread.m4 -- -rm -rf $(datadir)/aclocal/zthread.m4 -+zincludedir = $(includedir)/zthread -+zinclude_HEADERS = include/zthread/*.h - - distclean-local: - -rm -rf $(top_srcdir)/$(PACKAGE)-$(VERSION).tar.gz -diff --git a/configure.ac b/configure.ac -index 866041b..5d32a58 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -226,7 +226,6 @@ AC_TRY_LINK( [#include <windows.h>], [_beginthreadex((void*)0, 0, 0, (void*)0, 0 - - dnl Configure the final compiler & linker options - COMPILER_OPTIONS="$COMPILER_OPTIONS $CXXFLAGS" --LINKER_OPTIONS="$LINKER_OPTIONS $LDFLAGS" - - dnl Configured flags for compiling ZThreads - AC_SUBST(LINKER_OPTIONS) -diff --git a/src/Makefile.am b/src/Makefile.am -index 04404d6..35dc764 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -21,8 +21,6 @@ AM_CXXFLAGS = @COMPILER_OPTIONS@ @EXTRA_COMPILER_OPTIONS@ - INCLUDES = -I$(top_srcdir)/include - SUBDIRS=. - --libdir=$(prefix)/lib -- - lib_LTLIBRARIES = libZThread.la - - libZThread_la_LIBADD=@LINKER_OPTIONS@ @EXTRA_LINKER_OPTIONS@ --- -1.8.1.1 - diff --git a/dev-libs/zthread/files/zthread-2.3.2-clang.patch b/dev-libs/zthread/files/zthread-2.3.2-clang.patch deleted file mode 100644 index 3c0e07b9dc4a..000000000000 --- a/dev-libs/zthread/files/zthread-2.3.2-clang.patch +++ /dev/null @@ -1,15 +0,0 @@ -fix compile when using clang as $CC: - -Based on patch from https://bugs.launchpad.net/hugin/+bug/1213585 (rebased) - ---- a/include/zthread/Guard.h -+++ b/include/zthread/Guard.h -@@ -108,7 +108,7 @@ - } - - template <class LockType> -- static void createScope(LockHolder<LockType>& l, unsigned long ms) { -+ static bool createScope(LockHolder<LockType>& l, unsigned long ms) { - - if(Scope1::createScope(l, ms)) - if(!Scope2::createScope(l, ms)) { 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 deleted file mode 100644 index 998dc36c2976..000000000000 --- a/dev-libs/zthread/files/zthread-2.3.2-configure-clang16.patch +++ /dev/null @@ -1,22 +0,0 @@ -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.h>], -- [ 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 <pthread.h>], diff --git a/dev-libs/zthread/files/zthread-2.3.2-gcc47.patch b/dev-libs/zthread/files/zthread-2.3.2-gcc47.patch deleted file mode 100644 index 57b122d22c5f..000000000000 --- a/dev-libs/zthread/files/zthread-2.3.2-gcc47.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: Make sure to use qualified lookups. -http://bugs.debian.org/667430 -https://bugs.gentoo.org/show_bug.cgi?id=414133 - -Author: Cyril Brulebois <kibi@debian.org> ---- a/include/zthread/Guard.h -+++ b/include/zthread/Guard.h -@@ -428,7 +428,7 @@ - template <class U, class V> - Guard(Guard<U, V>& g) : LockHolder<LockType>(g) { - -- LockingPolicy::shareScope(*this, extract(g)); -+ LockingPolicy::shareScope(*this, this->extract(g)); - - } - -@@ -458,7 +458,7 @@ - template <class U, class V> - Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) { - -- LockingPolicy::transferScope(*this, extract(g)); -+ LockingPolicy::transferScope(*this, this->extract(g)); - - } - diff --git a/dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch b/dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch deleted file mode 100644 index 72163a3b12a3..000000000000 --- a/dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch +++ /dev/null @@ -1,26 +0,0 @@ -fix m4 warnings: -zthread.m4:34: warning: underquoted definition of AM_PATH_ZTHREAD -pthread.m4:39: warning: underquoted definition of AM_DETECT_PTHREAD - ---- a/share/zthread.m4 -+++ b/share/zthread.m4 -@@ -31,7 +31,7 @@ - dnl ZTHREAD_CXXFLAGS - dnl ZTHREAD_LIBS - dnl --AC_DEFUN(AM_PATH_ZTHREAD, -+AC_DEFUN([AM_PATH_ZTHREAD], - [ - - ---- a/share/pthread.m4 -+++ b/share/pthread.m4 -@@ -36,7 +36,7 @@ - GNU Pth can also be used if it was configured with --enable-pthread. - EOF - --AC_DEFUN(AM_DETECT_PTHREAD, -+AC_DEFUN([AM_DETECT_PTHREAD], - [ - - pthread_explicit="no" diff --git a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff b/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff deleted file mode 100644 index b8f68f59dd2a..000000000000 --- a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff +++ /dev/null @@ -1,94 +0,0 @@ ---- a/include/zthread/Guard.h -+++ b/include/zthread/Guard.h -@@ -491,7 +491,7 @@ - - try { - -- if(!isDisabled()) -+ if(!LockHolder<LockType>::isDisabled()) - LockingPolicy::destroyScope(*this); - - } catch (...) { /* ignore */ } ---- a/src/MutexImpl.h -+++ b/src/MutexImpl.h -@@ -153,7 +153,7 @@ - - _owner = self; - -- ownerAcquired(self); -+ MutexImpl<List,Behavior>::ownerAcquired(self); - - } - -@@ -164,7 +164,7 @@ - _waiters.insert(self); - m.acquire(); - -- waiterArrived(self); -+ MutexImpl<List, Behavior>::waiterArrived(self); - - { - -@@ -173,7 +173,7 @@ - - } - -- waiterDeparted(self); -+ MutexImpl<List, Behavior>::waiterDeparted(self); - - m.release(); - -@@ -192,7 +192,7 @@ - assert(_owner == 0); - _owner = self; - -- ownerAcquired(self); -+ MutexImpl<List, Behavior>::ownerAcquired(self); - - break; - -@@ -236,7 +236,7 @@ - - _owner = self; - -- ownerAcquired(self); -+ MutexImpl<List, Behavior>::ownerAcquired(self); - - } - -@@ -253,7 +253,7 @@ - - m.acquire(); - -- waiterArrived(self); -+ MutexImpl<List, Behavior>:: waiterArrived(self); - - { - -@@ -262,7 +262,7 @@ - - } - -- waiterDeparted(self); -+ MutexImpl<List, Behavior>::waiterDeparted(self); - - m.release(); - -@@ -284,7 +284,7 @@ - assert(0 == _owner); - _owner = self; - -- ownerAcquired(self); -+ MutexImpl<List, Behavior>::ownerAcquired(self); - - break; - -@@ -326,7 +326,7 @@ - - _owner = 0; - -- ownerReleased(impl); -+ MutexImpl<List, Behavior>::ownerReleased(impl); - - // Try to find a waiter with a backoff & retry scheme - for(;;) { diff --git a/dev-libs/zthread/metadata.xml b/dev-libs/zthread/metadata.xml deleted file mode 100644 index 7f7a727d1d59..000000000000 --- a/dev-libs/zthread/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">zthread</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-libs/zthread/zthread-2.3.2-r5.ebuild b/dev-libs/zthread/zthread-2.3.2-r5.ebuild deleted file mode 100644 index 08b64a050964..000000000000 --- a/dev-libs/zthread/zthread-2.3.2-r5.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2024 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-text/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 -} |