diff options
author | 2024-04-27 17:56:47 +0300 | |
---|---|---|
committer | 2024-04-27 17:56:47 +0300 | |
commit | 5cdcb810e27d4b7be8507a6c0f7c28ef68e65dac (patch) | |
tree | ca46185983f9049d8a5bd929b897864d32f14cb9 /dev-libs/zthread/files | |
parent | sci-libs/xgks-pmel: treeclean (diff) | |
download | gentoo-5cdcb810e27d4b7be8507a6c0f7c28ef68e65dac.tar.gz gentoo-5cdcb810e27d4b7be8507a6c0f7c28ef68e65dac.tar.bz2 gentoo-5cdcb810e27d4b7be8507a6c0f7c28ef68e65dac.zip |
dev-libs/zthread: treeclean
Closes: https://bugs.gentoo.org/924925
Bug: https://bugs.gentoo.org/912434
Bug: https://bugs.gentoo.org/715478
Bug: https://bugs.gentoo.org/903529
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
Diffstat (limited to 'dev-libs/zthread/files')
6 files changed, 0 insertions, 257 deletions
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(;;) { |