[gentoo-commits] repo/gentoo:master commit in: dev-libs/zthread/files/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/zthread/files/

[David Seifert]

commit:     aae08e67bf31c1fd930cc89e1d6a78389dc7e54f
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Dec  1 15:20:09 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 13:12:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aae08e67

dev-libs/zthread: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6372

 .../zthread/files/zthread-2.3.2-automake.patch     | 45 ----------------------
 1 file changed, 45 deletions(-)

diff --git a/dev-libs/zthread/files/zthread-2.3.2-automake.patch b/dev-libs/zthread/files/zthread-2.3.2-automake.patch
deleted file mode 100644
index f2eae68c505..00000000000
--- a/dev-libs/zthread/files/zthread-2.3.2-automake.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-use standard automake rules rather than hand coding the install rules
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -24,24 +24,13 @@
- 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
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -21,8 +21,6 @@
- INCLUDES = -I$(top_srcdir)/include
- SUBDIRS=.
- 
--libdir=$(prefix)/lib
--
- lib_LTLIBRARIES = libZThread.la
- 
- libZThread_la_LIBADD=@LINKER_OPTIONS@ @EXTRA_LINKER_OPTIONS@

[gentoo-commits] repo/gentoo:master commit in: dev-libs/zthread/files/

[David Seifert]

commit:     12b0efc1f523095036016187079bf534ae1d7431
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Apr 22 07:55:52 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Apr 23 09:53:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12b0efc1

dev-libs/zthread: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/11780
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/zthread-2.3.2-no-fpermissive.diff        | 94 ----------------------
 1 file changed, 94 deletions(-)

diff --git a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive.diff b/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive.diff
deleted file mode 100644
index 21fad7c52c8..00000000000
--- a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive.diff
+++ /dev/null
@@ -1,94 +0,0 @@
---- include/zthread/Guard.h.orig	2008-07-22 14:46:28.000000000 +0200
-+++ include/zthread/Guard.h	2008-07-22 14:51:41.000000000 +0200
-@@ -491,7 +491,7 @@
-     
-   try {
-     
--    if(!isDisabled())
-+    if(!LockHolder<LockType>::isDisabled())
-       LockingPolicy::destroyScope(*this);
-     
-   } catch (...) { /* ignore */ }  
---- src/MutexImpl.h.orig	2008-07-22 14:54:40.000000000 +0200
-+++ src/MutexImpl.h	2008-07-22 15:03:30.000000000 +0200
-@@ -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(;;) {