diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-libs/zthread | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-libs/zthread')
-rw-r--r-- | dev-libs/zthread/Manifest | 1 | ||||
-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-automake.patch | 45 | ||||
-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.diff | 94 | ||||
-rw-r--r-- | dev-libs/zthread/metadata.xml | 8 | ||||
-rw-r--r-- | dev-libs/zthread/zthread-2.3.2-r1.ebuild | 59 | ||||
-rw-r--r-- | dev-libs/zthread/zthread-2.3.2-r2.ebuild | 63 | ||||
-rw-r--r-- | dev-libs/zthread/zthread-2.3.2-r3.ebuild | 66 |
10 files changed, 462 insertions, 0 deletions
diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest new file mode 100644 index 000000000000..83ec03e9eaf7 --- /dev/null +++ b/dev-libs/zthread/Manifest @@ -0,0 +1 @@ +DIST ZThread-2.3.2.tar.gz 412527 SHA256 950908b7473ac10abb046bd1d75acb5934344e302db38c2225b7a90bd1eda854 SHA512 e17e12746d16f32f6f1dc8ec041795f3c05a541c015b9579252599b51de9f97dc780946e6e83b41ca78d1af892455e6f00169a089f6e1a7c3196d6a4f49a7f7b WHIRLPOOL c5ceca4639b26a86936ff49e781737b9b7e59abcd0ececa5a0799b01460a23c88c18c84027dcdbf16cd5c98549dfceba3a4d30a71c0052f8ffdbe0a824e2c254 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?= <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-automake.patch b/dev-libs/zthread/files/zthread-2.3.2-automake.patch new file mode 100644 index 000000000000..f2eae68c505b --- /dev/null +++ b/dev-libs/zthread/files/zthread-2.3.2-automake.patch @@ -0,0 +1,45 @@ +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@ 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 <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 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.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<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(;;) { diff --git a/dev-libs/zthread/metadata.xml b/dev-libs/zthread/metadata.xml new file mode 100644 index 000000000000..a0ea0d126771 --- /dev/null +++ b/dev-libs/zthread/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>cpp</herd> + <upstream> + <remote-id type="sourceforge">zthread</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-libs/zthread/zthread-2.3.2-r1.ebuild b/dev-libs/zthread/zthread-2.3.2-r1.ebuild new file mode 100644 index 000000000000..82b4a7e8e63e --- /dev/null +++ b/dev-libs/zthread/zthread-2.3.2-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 new file mode 100644 index 000000000000..4ec42fad9a37 --- /dev/null +++ b/dev-libs/zthread/zthread-2.3.2-r2.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 +} 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..9f0a6df9d634 --- /dev/null +++ b/dev-libs/zthread/zthread-2.3.2-r3.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 +} |