Date: Thu, 17 Jan 2013 18:59:08 +0000 (UTC) From: Greg Larkin <glarkin@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310556 - in head/devel/zthread: . files Message-ID: <201301171859.r0HIx8A4055065@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glarkin Date: Thu Jan 17 18:59:07 2013 New Revision: 310556 URL: http://svnweb.freebsd.org/changeset/ports/310556 Log: - Fixed clang and current gcc build - Suppressed warnings emitted by clang PR: ports/174852 Submitted by: Michael Gmelin <freebsd@grem.de> Added: head/devel/zthread/files/patch-src__ThreadQueue.cxx (contents, props changed) Modified: head/devel/zthread/Makefile head/devel/zthread/files/patch-include__zthread__Guard.h Modified: head/devel/zthread/Makefile ============================================================================== --- head/devel/zthread/Makefile Thu Jan 17 18:57:54 2013 (r310555) +++ head/devel/zthread/Makefile Thu Jan 17 18:59:07 2013 (r310556) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ZThread -# Date created: 23 May 2001 -# Whom: pvh@egenetics.com -# +# Created by: pvh@egenetics.com # $FreeBSD$ -# PORTNAME= zthread PORTVERSION= 2.3.2 @@ -23,6 +19,8 @@ MAKE_ARGS+= INSTALL_PROGRAM="${INSTALL_S MAKE_ENV+= SED=sed # req'd for LIBTOOL?! USE_LDCONFIG= yes +OPTIONS_DEFINE= DOCS + PORTDOCS= AUTHORS ChangeLog NEWS README TODO post-extract: @@ -31,8 +29,10 @@ post-extract: post-patch: @${FIND} ${WRKSRC} \( -name '*.orig' -or -name '*.swp' \) -delete +.include <bsd.port.options.mk> + post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${INSTALL} -d ${DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif Modified: head/devel/zthread/files/patch-include__zthread__Guard.h ============================================================================== --- head/devel/zthread/files/patch-include__zthread__Guard.h Thu Jan 17 18:57:54 2013 (r310555) +++ head/devel/zthread/files/patch-include__zthread__Guard.h Thu Jan 17 18:59:07 2013 (r310556) @@ -1,5 +1,32 @@ --- ./include/zthread/Guard.h.orig 2005-03-12 21:10:09.000000000 -0500 -+++ ./include/zthread/Guard.h 2009-04-23 15:03:09.000000000 -0400 ++++ ./include/zthread/Guard.h 2013-01-17 13:50:40.000000000 -0500 +@@ -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)) { +@@ -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)); + + } + @@ -491,7 +491,7 @@ try { Added: head/devel/zthread/files/patch-src__ThreadQueue.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/zthread/files/patch-src__ThreadQueue.cxx Thu Jan 17 18:59:07 2013 (r310556) @@ -0,0 +1,16 @@ +--- ./src/ThreadQueue.cxx.orig 2005-03-12 22:55:23.000000000 -0500 ++++ ./src/ThreadQueue.cxx 2013-01-17 13:48:32.000000000 -0500 +@@ -139,11 +139,12 @@ + + // Wake the main thread,if its waiting, when the last pending-thread becomes available; + // Otherwise, take note that no wait for pending threads to finish is needed +- if(_userThreads.empty()) ++ if(_userThreads.empty()) { + if(_waiter && _waiter != (ThreadImpl*)1) + _waiter->getMonitor().notify(); + else + _waiter = (ThreadImpl*)!_waiter; ++ } + + ZTDEBUG("1 pending-thread added.\n"); +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301171859.r0HIx8A4055065>