[gentoo-commits] repo/gentoo:master commit in: dev-libs/zthread/, dev-libs/zthread/files/
commit: fba65ffab4bf1f7310dc28f0249db4a234ff7f6c
Author: Sam James gentoo org>
AuthorDate: Wed Dec 7 14:17:56 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 7 14:18:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fba65ffa
dev-libs/zthread: EAPI 8, fix configure w/ clang 16
Signed-off-by: Sam James gentoo.org>
.../files/zthread-2.3.2-configure-clang16.patch| 22 ++
...ead-2.3.2-r4.ebuild => zthread-2.3.2-r5.ebuild} | 6 +++---
2 files changed, 25 insertions(+), 3 deletions(-)
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 ..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-r5.ebuild
similarity index 93%
rename from dev-libs/zthread/zthread-2.3.2-r4.ebuild
rename to dev-libs/zthread/zthread-2.3.2-r5.ebuild
index 96e7f7294154..87af37d2ba8d 100644
--- a/dev-libs/zthread/zthread-2.3.2-r4.ebuild
+++ b/dev-libs/zthread/zthread-2.3.2-r5.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools
@@ -25,6 +25,7 @@ PATCHES=(
"${FILESDIR}"/${P}-automake-r2.patch
"${FILESDIR}"/${P}-gcc47.patch
"${FILESDIR}"/${P}-clang.patch
+ "${FILESDIR}"/${P}-configure-clang16.patch
)
src_prepare() {
@@ -41,8 +42,7 @@ src_prepare() {
src_configure() {
econf \
$(use_enable debug) \
- $(use_enable kernel_linux atomic-linux) \
- --disable-static
+ $(use_enable kernel_linux atomic-linux)
}
src_compile() {
[gentoo-commits] repo/gentoo:master commit in: dev-libs/zthread/
commit: 0070717e7bd7c7f381e10f0fd3b918f0aa8d192d
Author: Aaron Bauman gentoo org>
AuthorDate: Mon May 20 17:08:22 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Mon May 20 17:22:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0070717e
dev-libs/zthread: arm64 stable
Signed-off-by: Aaron Bauman gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"
dev-libs/zthread/zthread-2.3.2-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-libs/zthread/zthread-2.3.2-r4.ebuild
b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
index 02a19d70ea2..fd36ce8012a 100644
--- a/dev-libs/zthread/zthread-2.3.2-r4.ebuild
+++ b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~mips ppc ~sparc x86"
+KEYWORDS="alpha amd64 arm64 ~hppa ~mips ppc ~sparc x86"
IUSE="debug doc kernel_linux static-libs"
DEPEND="doc? ( app-doc/doxygen )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/zthread/files/
commit: 12b0efc1f523095036016187079bf534ae1d7431
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Mon Apr 22 07:55:52 2019 +
Commit: David Seifert gentoo org>
CommitDate: Tue Apr 23 09:53:01 2019 +
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 gmail.com>
Signed-off-by: David Seifert 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..000
--- 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.0 +0200
-+++ include/zthread/Guard.h2008-07-22 14:51:41.0 +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.0 +0200
-+++ src/MutexImpl.h2008-07-22 15:03:30.0 +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(;;) {
[gentoo-commits] repo/gentoo:master commit in: dev-libs/zthread/
commit: 28696ec600bdd5add4e97624ae648d03ca671ed2
Author: Michał Górny gentoo org>
AuthorDate: Thu Apr 18 13:01:14 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Apr 18 13:29:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28696ec6
dev-libs/zthread: Drop old
Signed-off-by: Michał Górny gentoo.org>
dev-libs/zthread/zthread-2.3.2-r3.ebuild | 65
1 file changed, 65 deletions(-)
diff --git a/dev-libs/zthread/zthread-2.3.2-r3.ebuild
b/dev-libs/zthread/zthread-2.3.2-r3.ebuild
deleted file mode 100644
index c45773dbced..000
--- a/dev-libs/zthread/zthread-2.3.2-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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
-}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/zthread/files/
commit: aae08e67bf31c1fd930cc89e1d6a78389dc7e54f Author: Michael Mair-Keimberger gmail com> AuthorDate: Fri Dec 1 15:20:09 2017 + Commit: David Seifert gentoo org> CommitDate: Sat Dec 23 13:12:15 2017 + 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..000 --- 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/
commit: 6fff6aaa885cf067a7fa0a1a3e389c6f172161ea
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Nov 19 12:59:33 2017 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Nov 19 13:03:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fff6aaa
dev-libs/zthread: stable 2.3.2-r4 for ppc, bug #632326
Package-Manager: Portage-2.3.14, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"
dev-libs/zthread/zthread-2.3.2-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/zthread/zthread-2.3.2-r4.ebuild
b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
index 33b3ecb1670..02a19d70ea2 100644
--- a/dev-libs/zthread/zthread-2.3.2-r4.ebuild
+++ b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~mips ~ppc ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ~mips ppc ~sparc x86"
IUSE="debug doc kernel_linux static-libs"
DEPEND="doc? ( app-doc/doxygen )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/zthread/
commit: fccd7c5591accd239e21dcf6892f91a85925738d
Author: Manuel Rüger gentoo org>
AuthorDate: Thu Nov 2 21:45:23 2017 +
Commit: Manuel Rüger gentoo org>
CommitDate: Thu Nov 2 21:45:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fccd7c55
dev-libs/zthread: Stable on amd64
Package-Manager: Portage-2.3.12, Repoman-2.3.4
dev-libs/zthread/zthread-2.3.2-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/zthread/zthread-2.3.2-r4.ebuild
b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
index 0cd6a02accd..6f31d024210 100644
--- a/dev-libs/zthread/zthread-2.3.2-r4.ebuild
+++ b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~sparc x86"
IUSE="debug doc kernel_linux static-libs"
DEPEND="doc? ( app-doc/doxygen )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/zthread/
commit: 7c86975b8d71da8c66099bc830842f1fea103ce1
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Nov 2 21:04:47 2017 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Nov 2 21:13:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c86975b
dev-libs/zthread: x86 stable (bug #632326)
Package-Manager: Portage-2.3.13, Repoman-2.3.4
dev-libs/zthread/zthread-2.3.2-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-libs/zthread/zthread-2.3.2-r4.ebuild
b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
index aeb476d946f..0cd6a02accd 100644
--- a/dev-libs/zthread/zthread-2.3.2-r4.ebuild
+++ b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc x86"
IUSE="debug doc kernel_linux static-libs"
DEPEND="doc? ( app-doc/doxygen )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/zthread/
commit: d22581a4a7d5d2aae357bddc0e85665911f5ef84
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Tue Oct 31 16:43:09 2017 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Tue Oct 31 16:43:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d22581a4
dev-libs/zthread: Remove old
Package-Manager: Portage-2.3.13, Repoman-2.3.4
dev-libs/zthread/zthread-2.3.2-r1.ebuild | 58 --
dev-libs/zthread/zthread-2.3.2-r2.ebuild | 62
2 files changed, 120 deletions(-)
diff --git a/dev-libs/zthread/zthread-2.3.2-r1.ebuild
b/dev-libs/zthread/zthread-2.3.2-r1.ebuild
deleted file mode 100644
index b80a5aca575..000
--- a/dev-libs/zthread/zthread-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils autotools
-
-MY_P=ZThread-${PV}
-
-DESCRIPTION="A 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
-
- AT_M4DIR="share" eautoreconf
-}
-
-src_configure() {
- local myconf
- use debug && myconf="--enable-debug"
-
- econf \
- $(use_enable kernel_linux atomic-linux) \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_compile() {
- emake || die
-
- if use doc; then
- doxygen doc/zthread.doxygen || die
- cp doc/documentation.html doc/html/index.html || die
- cp doc/zthread.css doc/html/zthread.css || die
- cp doc/bugs.js doc/html/bugs.js || die
- fi
-}
-
-src_install() {
- einstall || die
-
- dodoc AUTHORS ChangeLog NEWS README TODO
- use doc && dohtml doc/html/*
-
- find "${D}" -name '*.la' -delete
-}
diff --git a/dev-libs/zthread/zthread-2.3.2-r2.ebuild
b/dev-libs/zthread/zthread-2.3.2-r2.ebuild
deleted file mode 100644
index d59acb7085f..000
--- a/dev-libs/zthread/zthread-2.3.2-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-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
- epatch "${FILESDIR}"/${P}-m4-quote.patch
- epatch "${FILESDIR}"/${P}-automake.patch
- epatch "${FILESDIR}"/${P}-gcc47.patch
-
- 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() {
- emake
-
- if use doc; then
- doxygen doc/zthread.doxygen || die
- cp doc/documentation.html doc/html/index.html || die
- cp doc/zthread.css doc/html/zthread.css || die
- cp doc/bugs.js doc/html/bugs.js || die
- fi
-}
-
-src_install() {
- emake install DESTDIR="${ED}"
-
- dodoc AUTHORS ChangeLog NEWS README TODO
- use doc && dohtml doc/html/*
-
- use static-libs || find "${ED}" -name '*.la' -delete
-}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/zthread/
commit: f5a54687706110fed9b8c940dba20eeaf5c2d649
Author: Patrick Lauer gentoo org>
AuthorDate: Sun Jun 12 08:15:51 2016 +
Commit: Patrick Lauer gentoo org>
CommitDate: Sun Jun 12 08:15:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5a54687
dev-libs/zthread: Whitespace
Package-Manager: portage-2.3.0_rc1
dev-libs/zthread/zthread-2.3.2-r4.ebuild | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-libs/zthread/zthread-2.3.2-r4.ebuild
b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
index 154f895..8f2e220 100644
--- a/dev-libs/zthread/zthread-2.3.2-r4.ebuild
+++ b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
@@ -23,11 +23,11 @@ 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
+ "${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() {
[gentoo-commits] repo/gentoo:master commit in: dev-libs/zthread/, dev-libs/zthread/files/
commit: 5f3562b328dcadeb4f73863bac2128a67df87eda
Author: Austin English gentoo org>
AuthorDate: Thu Jun 2 06:41:15 2016 +
Commit: Austin English gentoo org>
CommitDate: Thu Jun 2 21:42:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f3562b3
dev-libs/zthread: fix building with clang
Gentoo-Bug: https://bugs.gentoo.org/506934
Reviewed-By: David Seifert gentoo.org>
Package-Manager: portage-2.2.26
dev-libs/zthread/files/zthread-2.3.2-clang.patch | 16
.../files/zthread-2.3.2-no-fpermissive-r1.diff | 94 ++
dev-libs/zthread/zthread-2.3.2-r4.ebuild | 67 +++
3 files changed, 177 insertions(+)
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 000..13dd91e
--- /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-no-fpermissive-r1.diff
b/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff
new file mode 100644
index 000..94b42ee
--- /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.0 +0200
b/include/zthread/Guard.h 2008-07-22 14:51:41.0 +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.0 +0200
b/src/MutexImpl.h 2008-07-22 15:03:30.0 +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/zthread-2.3.2-r4.ebuild
b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
new file mode 100644
index 000..154f895
--- /dev/null
+++ b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+
