devel/openthreads is a building block used by OpenSceneGraph (graphics/osg), which has recently gone to 1.0 release. The OpenThreads source is released as part of the OpenSceneGraph archive, and the current version here is no longer compatible with osg-1.0. Attempting to build osg-1.0 using the FreeBSD openthreads package fails due to changes in headers, and general OpenThreads development. Fix: The following context diff will upgrade the devel/openthreads files to build using the more recent release: ----8<---- Note: I have read the request above concerning embedding plain code, however I cannot use the send-pr command because my raw mail isn't properly setup. I do have an ISP-based email account, as listed above;--zjoXgXdaVYQK7QovgMYfK96eMqCvzDsVcPz6ihNRjtrP2B9O Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" diff -ur --expand-tabs openthreads-ORIG/Makefile openthreads/Makefile --- openthreads-ORIG/Makefile Tue Jan 25 07:04:54 2005 +++ openthreads/Makefile Sun Jan 15 10:56:31 2006 @@ -6,32 +6,30 @@ # PORTNAME= openthreads -PORTVERSION= 1.2d3 +PORTVERSION= 1.4.2 PORTREVISION= 1 CATEGORIES= devel -MASTER_SITES= http://www.csie.nctu.edu.tw/~yinjieh/ -DISTNAME= OpenThreads-v1.2dev3-osg0.9.6 +MASTER_SITES= http://www.openscenegraph.org/downloads/snapshots/ +# +# the following master distribution contains the version of OpenThreads +# as described above by PORTVERSION and PORTREVISION. +DISTNAME= OSG_OP_OT-1.0 MAINTAINER= yinjieh@csie.nctu.edu.tw COMMENT= A library which provides OO thread interface for C++ programmers +USE_ZIP= yes USE_GMAKE= yes -USE_REINPLACE= yes -MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} INSTALLS_SHLIB= yes -WRKSRC= ${WRKDIR}/${DISTNAME} MAKEFILE= GNUmakefile +WRKSRC= ${WRKDIR}/${DISTNAME}/OpenThreads -# opt = optimized ($OPTF added); debug = debug ($DBGF added); opt is default +# Optimisation/Debug flags: +# opt = optimized ($OPTF added); +# debug = debug ($DBGF added); +# opt is default +# ALL_TARGET= opt -.include <bsd.port.pre.mk> - -post-patch: - @${REINPLACE_CMD} -e 's,%%CXXFLAGS%%,${CXXFLAGS},g' \ - ${WRKSRC}/Make/makedefs - @${FIND} ${WRKSRC} -name '*.o' -delete - @${FIND} ${WRKSRC} -name '*.so' -delete - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -ur --expand-tabs openthreads-ORIG/distinfo openthreads/distinfo --- openthreads-ORIG/distinfo Wed Mar 31 12:37:04 2004 +++ openthreads/distinfo Sun Jan 15 06:23:27 2006 @@ -1,2 +1,2 @@ -MD5 (OpenThreads-v1.2dev3-osg0.9.6.tar.gz) = 15c8b9658d509e18a043c1ba0ef212ef -SIZE (OpenThreads-v1.2dev3-osg0.9.6.tar.gz) = 68342 +MD5 (OSG_OP_OT-1.0.zip) = dfb3eca46b32625602dabe9aa46c6b6f +SIZE (OSG_OP_OT-1.0.zip) = 5036053 Only in openthreads-ORIG/: files diff -ur --expand-tabs openthreads-ORIG/pkg-plist openthreads/pkg-plist --- openthreads-ORIG/pkg-plist Thu Nov 6 23:45:00 2003 +++ openthreads/pkg-plist Tue Nov 1 17:55:06 2005 @@ -1,8 +1,8 @@ include/OpenThreads/Barrier +include/OpenThreads/Condition +include/OpenThreads/Exports include/OpenThreads/Mutex -include/OpenThreads/Thread include/OpenThreads/ScopedLock -include/OpenThreads/Exports -include/OpenThreads/Condition +include/OpenThreads/Thread lib/libOpenThreads.so @dirrm include/OpenThreads Only in openthreads: work ---->8---- How-To-Repeat: Install the openthreads package, then attempt to build osg-1.0 using a pre-installed openthreads (rather than the version that comes with osg-1.0).
State Changed From-To: open->feedback Awaiting maintainers feedback
Dear Matthew, I approve this patch. By the way, please take over the maintainership if you can. Thanks! On Mon, May 08, 2006 at 04:52:34PM +0930, MFM wrote: > >Synopsis: Update devel/openthreads port to latest OSG-compatible version > > > >State-Changed-From-To: open->feedback > >State-Changed-By: edwin > >State-Changed-When: Mon Mar 27 09:44:11 UTC 2006 > >State-Changed-Why: > >Awaiting maintainers feedback > > > >http://www.freebsd.org/cgi/query-pr.cgi?pr=94998 > > > > Um, Ping? > > Regards, > Matthew May
State Changed From-To: feedback->open Maintainer approved.
Responsible Changed From-To: freebsd-ports-bugs->lawrance Hi.
State Changed From-To: open->feedback When I build this port, and then build the examples under work/OSG_OP_OT-1.0/OpenThreads/examples_src, they segfault when they are run. Is it busted?
G'day, sorry for the delay, I have worked on the pthreads flag problem, and believe I have implemented a workable solution. In the end I found I wasn't able to convince REINPLACE_CMD to insert a new line into a file, but had more success with AWK instead. In order to avoid problems with tab mangling, I have made a ZIP archive (attached) of all the files in my proposed devel/openthreads update. If you expand this in place of /usr/ports/devel/openthreads (renaming the original out of the way), you should now find that the examples work. I have also updated the distinfo with the SHA256 checksum, but still haven't changed the Maintainer addresses yet (is now the right time to do so?). Tested on 6.1-RELEASE/i386 with NVIDIA-87.62 driver. Regards, Matthew May
lawrance 2006-10-31 22:23:27 UTC FreeBSD ports repository Modified files: devel/openthreads Makefile distinfo pkg-plist devel/openthreads/files patch-Make::makedefs Added files: devel/openthreads/files patch-Make_instrules Removed files: devel/openthreads/files patch-pthread_src::PThreadConditionPrivateData.h Log: Update to 1.4.2. PR: ports/94998 Submitted by: Matthew May <rrghphar@bigpond.net.au> Approved by: Ying-Chieh Chen <yinjieh@csie.nctu.edu.tw> (maintainer) Revision Changes Path 1.6 +18 -18 ports/devel/openthreads/Makefile 1.4 +3 -3 ports/devel/openthreads/distinfo 1.3 +7 -8 ports/devel/openthreads/files/patch-Make::makedefs 1.1 +20 -0 ports/devel/openthreads/files/patch-Make_instrules (new) 1.2 +0 -14 ports/devel/openthreads/files/patch-pthread_src::PThreadConditionPrivateData.h (dead) 1.2 +3 -3 ports/devel/openthreads/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: feedback->closed Committed, thanks! Let me know if you want to put your name in the MAINTAINER line.