From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-libs/zthread/Manifest | 10 +++ .../zthread/files/zthread-2.3.2-automake-r2.patch | 75 +++++++++++++++++ dev-libs/zthread/files/zthread-2.3.2-clang.patch | 16 ++++ dev-libs/zthread/files/zthread-2.3.2-gcc47.patch | 25 ++++++ .../zthread/files/zthread-2.3.2-m4-quote.patch | 26 ++++++ .../files/zthread-2.3.2-no-fpermissive-r1.diff | 94 ++++++++++++++++++++++ .../files/zthread-2.3.2-no-fpermissive.diff | 94 ++++++++++++++++++++++ dev-libs/zthread/metadata.xml | 11 +++ dev-libs/zthread/zthread-2.3.2-r3.ebuild | 65 +++++++++++++++ dev-libs/zthread/zthread-2.3.2-r4.ebuild | 66 +++++++++++++++ 10 files changed, 482 insertions(+) create mode 100644 dev-libs/zthread/Manifest create mode 100644 dev-libs/zthread/files/zthread-2.3.2-automake-r2.patch create mode 100644 dev-libs/zthread/files/zthread-2.3.2-clang.patch create mode 100644 dev-libs/zthread/files/zthread-2.3.2-gcc47.patch create mode 100644 dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch create mode 100644 dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff create mode 100644 dev-libs/zthread/files/zthread-2.3.2-no-fpermissive.diff create mode 100644 dev-libs/zthread/metadata.xml create mode 100644 dev-libs/zthread/zthread-2.3.2-r3.ebuild create mode 100644 dev-libs/zthread/zthread-2.3.2-r4.ebuild (limited to 'dev-libs/zthread') diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest new file mode 100644 index 000000000000..ac6bb0d53312 --- /dev/null +++ b/dev-libs/zthread/Manifest @@ -0,0 +1,10 @@ +AUX zthread-2.3.2-automake-r2.patch 2383 BLAKE2B 7368559120cd6e3b3a891178eeae15dcb6e3b3705da16ae8cf913aa3d83f01ddc7771e3a4ff416a02bd26006ecb123ce00af6c2d66fe92699c425bdbfee87aec SHA512 dae4fad0d560e8681db8e212888a4976abb67fc8ce85a85cd56d743f7ebcefd2760e91de40a83bd9023173d90f10bdf731b501ad50c09a5e769de6080b9bbad6 +AUX zthread-2.3.2-clang.patch 581 BLAKE2B 70c3005548e8380ca69ac698c4894f70815ca81b8126a206d8fe117cb6288bda1fb6f07797cb6f3f1d19d7e9d84376cb3d937b800f54e03d1281c5a72a55d645 SHA512 caaa4e491563b5a3ce142d242bb5fc7c08ceaffc9fecaf9720b6ffaf9192ef2f8a8ce819fd9f60bc741ffc19b47f0e894017d5f7befd5efb51314a6245938a68 +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 2008 BLAKE2B 027c065581a86f6603dd0ff42bfa1446adf3faf514cde7ff5aaa8065fbb8a36779c2d237ffaef74d2af451cef38db5ff7c4520d043feddaeec2e26dc6252b001 SHA512 f5df932dc2a4a20c757ba0781891d53f5c4ad81b904107af0aff84759efd73ff200e9ec890e6e63679a66fc33b74f49ef88937bfb29a2bf666c443c68b6023d9 +AUX zthread-2.3.2-no-fpermissive.diff 2010 BLAKE2B 5456735110eaccfb46c3a7e4fefdfcaeb5e3d55ee84afba0ec349be36e95e790365916e9fb284e89e92495057e0bfe658ec80bee0b7052c72ac401ca0e9fbd76 SHA512 95f89cad5f531bb5374ae1e300080977defb69bf304221188204f3cbfbf4e23a1445cbe4174e279453a005ab410925b0111ce56ffac4aaf8656b50483a9f1a8d +DIST ZThread-2.3.2.tar.gz 412527 BLAKE2B f8b176a35ca2df21460825f4cf9406a0e0fdd0a320eca2ffa323c47f025fa76e087bc30e3f6f2dc061cd79b0346c023f736f5fa2d1b0829eef718197c4e50e67 SHA512 e17e12746d16f32f6f1dc8ec041795f3c05a541c015b9579252599b51de9f97dc780946e6e83b41ca78d1af892455e6f00169a089f6e1a7c3196d6a4f49a7f7b +EBUILD zthread-2.3.2-r3.ebuild 1461 BLAKE2B 0214ebdb48a5357b85caf9faa9c1a2b2a2abfa0f943164b08d6f71380f3d6e1a3b6686d5b7be6648bc1787d622817103a095fd50845dd84493f3fccbadf1ec4c SHA512 0001e221cf7368c9f6ec9174a6792f53e4bd7174244e4eaaaa6d81cd95a260afaef647a58fccaa60e0be20aa3ccdc2a9d30cfe8483f0e40e6ffd5f7de06378b0 +EBUILD zthread-2.3.2-r4.ebuild 1400 BLAKE2B 187cbe7dc8eeb306ed49ce764867c3fe340d0096f75c7e63213ac69e5336c001fe2ee6bc3260bd284c68ca0e81d4f543d3ea144ad1286c955f0ac485ee1bceda SHA512 dbad90c961fd55ae16a068c0bd433f201ec6eee145e9e8b6c2086cb1f38c35601bd8cc9be4e88aa231a61109f0ee09739c3ac80ea63d28bd3d3721985fa4fde5 +MISC metadata.xml 326 BLAKE2B 3fa1401644229e1eea16291af9d0953263662408b1319b38c4fb10047009b592db544e67c5467cfb8428c33f8a2594fd94f88a1289bd6e9c2b92310ef46d06e8 SHA512 b01487803f5222c80e0bec2b0acf7bc85a30c7314642ae8e178274b4872a17986ca88ef324700a732b1afb573b74eee64c2e1bf95c08e8fddeee5910969f2230 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 new file mode 100644 index 000000000000..bcd9e0675979 --- /dev/null +++ b/dev-libs/zthread/files/zthread-2.3.2-automake-r2.patch @@ -0,0 +1,75 @@ +From 577b34b74b7a73650d906f371044bfaed6e8b74c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tiziano=20M=C3=BCller?= +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 ], [_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 new file mode 100644 index 000000000000..13dd91ea2ca5 --- /dev/null +++ b/dev-libs/zthread/files/zthread-2.3.2-clang.patch @@ -0,0 +1,16 @@ +fix compile when using clang as $CC: + +Based on patch from https://bugs.launchpad.net/hugin/+bug/1213585 (rebased) + +diff -r 2a43e83684d5 src/foreign/zthread/include/zthread/Guard.h +--- a/include/zthread/Guard.h Sat Aug 10 11:31:46 2013 +0200 ++++ b/include/zthread/Guard.h Sun Aug 18 09:46:43 2013 +0200 +@@ -108,7 +108,7 @@ + } + + template +- static void createScope(LockHolder& l, unsigned long ms) { ++ static bool createScope(LockHolder& 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-gcc47.patch b/dev-libs/zthread/files/zthread-2.3.2-gcc47.patch new file mode 100644 index 000000000000..57b122d22c5f --- /dev/null +++ b/dev-libs/zthread/files/zthread-2.3.2-gcc47.patch @@ -0,0 +1,25 @@ +Description: Make sure to use qualified lookups. +http://bugs.debian.org/667430 +https://bugs.gentoo.org/show_bug.cgi?id=414133 + +Author: Cyril Brulebois +--- a/include/zthread/Guard.h ++++ b/include/zthread/Guard.h +@@ -428,7 +428,7 @@ + template + Guard(Guard& g) : LockHolder(g) { + +- LockingPolicy::shareScope(*this, extract(g)); ++ LockingPolicy::shareScope(*this, this->extract(g)); + + } + +@@ -458,7 +458,7 @@ + template + Guard(Guard& g, LockType& lock) : LockHolder(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 new file mode 100644 index 000000000000..72163a3b12a3 --- /dev/null +++ b/dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch @@ -0,0 +1,26 @@ +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 new file mode 100644 index 000000000000..94b42eedfbf3 --- /dev/null +++ b/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff @@ -0,0 +1,94 @@ +--- a/include/zthread/Guard.h 2008-07-22 14:46:28.000000000 +0200 ++++ b/include/zthread/Guard.h 2008-07-22 14:51:41.000000000 +0200 +@@ -491,7 +491,7 @@ + + try { + +- if(!isDisabled()) ++ if(!LockHolder::isDisabled()) + LockingPolicy::destroyScope(*this); + + } catch (...) { /* ignore */ } +--- a/src/MutexImpl.h 2008-07-22 14:54:40.000000000 +0200 ++++ b/src/MutexImpl.h 2008-07-22 15:03:30.000000000 +0200 +@@ -153,7 +153,7 @@ + + _owner = self; + +- ownerAcquired(self); ++ MutexImpl::ownerAcquired(self); + + } + +@@ -164,7 +164,7 @@ + _waiters.insert(self); + m.acquire(); + +- waiterArrived(self); ++ MutexImpl::waiterArrived(self); + + { + +@@ -173,7 +173,7 @@ + + } + +- waiterDeparted(self); ++ MutexImpl::waiterDeparted(self); + + m.release(); + +@@ -192,7 +192,7 @@ + assert(_owner == 0); + _owner = self; + +- ownerAcquired(self); ++ MutexImpl::ownerAcquired(self); + + break; + +@@ -236,7 +236,7 @@ + + _owner = self; + +- ownerAcquired(self); ++ MutexImpl::ownerAcquired(self); + + } + +@@ -253,7 +253,7 @@ + + m.acquire(); + +- waiterArrived(self); ++ MutexImpl:: waiterArrived(self); + + { + +@@ -262,7 +262,7 @@ + + } + +- waiterDeparted(self); ++ MutexImpl::waiterDeparted(self); + + m.release(); + +@@ -284,7 +284,7 @@ + assert(0 == _owner); + _owner = self; + +- ownerAcquired(self); ++ MutexImpl::ownerAcquired(self); + + break; + +@@ -326,7 +326,7 @@ + + _owner = 0; + +- ownerReleased(impl); ++ MutexImpl::ownerReleased(impl); + + // Try to find a waiter with a backoff & retry scheme + for(;;) { 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 new file mode 100644 index 000000000000..21fad7c52c8e --- /dev/null +++ b/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive.diff @@ -0,0 +1,94 @@ +--- 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::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::ownerAcquired(self); + + } + +@@ -164,7 +164,7 @@ + _waiters.insert(self); + m.acquire(); + +- waiterArrived(self); ++ MutexImpl::waiterArrived(self); + + { + +@@ -173,7 +173,7 @@ + + } + +- waiterDeparted(self); ++ MutexImpl::waiterDeparted(self); + + m.release(); + +@@ -192,7 +192,7 @@ + assert(_owner == 0); + _owner = self; + +- ownerAcquired(self); ++ MutexImpl::ownerAcquired(self); + + break; + +@@ -236,7 +236,7 @@ + + _owner = self; + +- ownerAcquired(self); ++ MutexImpl::ownerAcquired(self); + + } + +@@ -253,7 +253,7 @@ + + m.acquire(); + +- waiterArrived(self); ++ MutexImpl:: waiterArrived(self); + + { + +@@ -262,7 +262,7 @@ + + } + +- waiterDeparted(self); ++ MutexImpl::waiterDeparted(self); + + m.release(); + +@@ -284,7 +284,7 @@ + assert(0 == _owner); + _owner = self; + +- ownerAcquired(self); ++ MutexImpl::ownerAcquired(self); + + break; + +@@ -326,7 +326,7 @@ + + _owner = 0; + +- ownerReleased(impl); ++ MutexImpl::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 new file mode 100644 index 000000000000..9512460c6411 --- /dev/null +++ b/dev-libs/zthread/metadata.xml @@ -0,0 +1,11 @@ + + + + + cpp@gentoo.org + Gentoo C++ Project + + + zthread + + diff --git a/dev-libs/zthread/zthread-2.3.2-r3.ebuild b/dev-libs/zthread/zthread-2.3.2-r3.ebuild new file mode 100644 index 000000000000..c45773dbced4 --- /dev/null +++ b/dev-libs/zthread/zthread-2.3.2-r3.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit eutils 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" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="alpha amd64 ~hppa ~mips ppc sparc x86" +IUSE="debug doc kernel_linux static-libs" + +DEPEND="doc? ( app-doc/doxygen )" +RDEPEND="" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + rm -f include/zthread/{.Barrier.h.swp,Barrier.h.orig} || die + epatch \ + "${FILESDIR}"/${P}-no-fpermissive.diff \ + "${FILESDIR}"/${P}-m4-quote.patch \ + "${FILESDIR}"/${P}-automake-r2.patch \ + "${FILESDIR}"/${P}-gcc47.patch + + sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467778 + + AT_M4DIR="share" eautoreconf +} + +src_configure() { + local myconf + # Autoconf does not support --disable-debug properly. + use debug && myconf="--enable-debug" + + econf \ + $(use_enable kernel_linux atomic-linux) \ + $(use_enable static-libs static) \ + ${myconf} +} + +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 && dohtml doc/html/* + + prune_libtool_files +} diff --git a/dev-libs/zthread/zthread-2.3.2-r4.ebuild b/dev-libs/zthread/zthread-2.3.2-r4.ebuild new file mode 100644 index 000000000000..02a19d70ea2b --- /dev/null +++ b/dev-libs/zthread/zthread-2.3.2-r4.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools eutils + +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" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="alpha amd64 ~hppa ~mips ppc ~sparc x86" +IUSE="debug doc kernel_linux static-libs" + +DEPEND="doc? ( app-doc/doxygen )" +RDEPEND="" + +S="${WORKDIR}/${MY_P}" + +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 + + sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467778 + + AT_M4DIR="share" eautoreconf +} + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable kernel_linux atomic-linux) \ + $(use_enable static-libs 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 + + prune_libtool_files +} -- cgit v1.2.3