Re: boost 1.52.0 status
On Fri, 25 Jan 2013 05:58:38 -0500
Brad Smith wrote:
> On Fri, Nov 23, 2012 at 05:06:46PM -0600, Amit Kulkarni wrote:
> > Hi all
>
> Amit and co.
>
> Here is an updated diff for Boost 1.52 with the context library
> disabled.
>
> Ports utilizing Boost need some run-time testing. Please get back
> to me with what ports have been tested.
>
brad,
with the inclusion of net/libircclient in cvs by stsp@, here's an updated diff
for games/pokerth with boost 1.52.0.
note, since only the ircclient headers changed and since pokerth takes a long
time to compile, pokerth was not built on this old machine.
thx
Index: Makefile
===
RCS file: /cvs/ports/games/pokerth/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile29 Mar 2012 13:38:30 - 1.20
+++ Makefile29 Jan 2013 21:58:45 -
@@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.20 2012/03/29 13:38:30 sthen Exp $
-COMMENT= Qt4 poker game with online capabilities
+COMMENT= texas hold'em poker game with online capabilities
-V= 0.8.3
+V= 1.0
DISTNAME= PokerTH-${V}-src
PKGNAME= pokerth-${V}
-REVISION= 0
CATEGORIES=games x11
HOMEPAGE= http://www.pokerth.net/
@@ -16,23 +15,32 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
+WANTLIB += c m pthread stdc++
+WANTLIB += ICE lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSql SDL SDL_mixer SM
+WANTLIB += X11 Xext Xi Xinerama Xrender boost_filesystem-mt boost_iostreams-mt
+WANTLIB += boost_program_options-mt boost_random-mt boost_regex-mt
+WANTLIB += boost_system-mt boost_thread-mt crypto curl fontconfig
+WANTLIB += freetype gsasl ircclient protobuf sqlite3 ssl tinyxml
+
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pokerth/}
EXTRACT_SUFX= .tar.bz2
-WANTLIB += QtGui QtNetwork QtSql SDL SDL_mixer boost_filesystem-mt
-WANTLIB += boost_iostreams-mt boost_program_options-mt boost_regex-mt
-WANTLIB += boost_system-mt boost_thread-mt c crypto curl gsasl
-WANTLIB += m pthread sqlite3 ssl stdc++
-
MODULES= devel/gettext \
x11/qt4
+# PaxHeaders created in PLIST if not using gtar
+BUILD_DEPENDS= archivers/gtar
+TAR= ${LOCALBASE}/bin/gtar
+
RUN_DEPENDS= devel/desktop-file-utils
LIB_DEPENDS= devel/sdl-mixer \
devel/boost \
+ devel/protobuf \
net/curl \
- security/libgsasl
+ net/libircclient \
+ security/libgsasl \
+ textproc/tinyxml
CONFIGURE_ENV= HOME=${WRKDIR}
Index: distinfo
===
RCS file: /cvs/ports/games/pokerth/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo17 May 2011 11:49:49 - 1.7
+++ distinfo29 Jan 2013 21:58:45 -
@@ -1,5 +1,2 @@
-MD5 (PokerTH-0.8.3-src.tar.bz2) = rb5WrV9UfrJV2tkd5WS/HA==
-RMD160 (PokerTH-0.8.3-src.tar.bz2) = eEzHVn3qc3NYRwhCeO+22OZWOp8=
-SHA1 (PokerTH-0.8.3-src.tar.bz2) = 3vdf4srhoeIxFKjAO2kIWpjWluA=
-SHA256 (PokerTH-0.8.3-src.tar.bz2) =
/2gFR1O4fchxMwapa1MQiy5IVhAIaihIHw/D16NloC4=
-SIZE (PokerTH-0.8.3-src.tar.bz2) = 7037418
+SHA256 (PokerTH-1.0-src.tar.bz2) = Wqr5E6dpbxKv4Y+bLaVchPc0O/ivtFsl94UqJf0abBA=
+SIZE (PokerTH-1.0-src.tar.bz2) = 19125507
Index: patches/patch-src_net_common_ircthread_cpp
===
RCS file: patches/patch-src_net_common_ircthread_cpp
diff -N patches/patch-src_net_common_ircthread_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_net_common_ircthread_cpp 29 Jan 2013 21:58:45 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- src/net/common/ircthread.cpp.orig Tue Jan 29 15:53:10 2013
src/net/common/ircthread.cpp Tue Jan 29 15:53:44 2013
+@@ -32,7 +32,8 @@
+ #include
+ #include
+ #include
+-#include
++#include
++#include
+ #include
+ #include
+ #include
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/pokerth/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 26 Oct 2010 09:41:51 - 1.7
+++ pkg/PLIST 29 Jan 2013 21:58:46 -
@@ -8,8 +8,7 @@ share/pokerth/
share/pokerth/data/
share/pokerth/data/data-copyright.txt
share/pokerth/data/fonts/
-share/pokerth/data/fonts/VeraBd.ttf
-share/pokerth/data/fonts/c059013l.pfb
+share/pokerth/data/fonts/DejaVuSans-Bold.ttf
share/pokerth/data/fonts/n019003l.pfb
share/pokerth/data/gfx/
share/pokerth/data/gfx/avatars/
@@ -218,6 +217,62 @@ share/pokerth/data/gfx/cards/default4c/9
share/pokerth/data/gfx/cards/default4c/default4cdeckstyle.xml
share/pokerth/data/gfx/cards/default4c/flipside.png
share/pokerth/data/gfx/cards/default4c/preview.png
+share/pokerth/data/gfx/cards/default_800x480/
+share/pokerth/data/gfx/cards/default_800x480/0.png
+share/pokerth/data/gfx/cards/default_800x480/1.png
+share/poke
Re: boost 1.52.0 status
> Ports utilizing Boost need some run-time testing. Please get back > to me with what ports have been tested. brad, i have tested the ports by just opening them and closing the programs. i.e little to no runtime testing otherwise. played a game of pokerth, explored enblend-enfuse and blender, and just opened openscad to see what it does. is it now too late to commit for this cycle? thanks
Re: boost 1.52.0 status
On Sat, 19 Jan 2013 22:13:06 +0100 Antoine Jacoutot wrote: > Just one nitpick. > I'd put TAR= and BUILD_DEPENDS on gtar close together with a comment like '# > Paxheaders' or something. > So that we don't wonder why it needs gtar. > It's possible that in the future our tar will be able to cope with it. > reattached pokerth.diff with antoine's feedback. thanks pokerth_rev3.diff Description: Binary data
Re: boost 1.52.0 status
> > > > i am in the process of getting my ancient amd64 box updated. so is it
> > > > ok to try to update openscad and pokerth to latest released versions?
> > > > i don't want to patch in a zillion places, i assume authors *must*
> > > > have patched to work with latest boost.
> > >
> > > If an update can be done then try to do so. That is preferred.
> >
> > find attached...
> >
> > a license issue in new port net/libircclient, what is the license?
> >
> > in ${WRKSRC}/LICENSE says LGPLv2+, but in all of ${WRKSRC}/src/*.c, it says
> > LGPLv3+. please adjust accordingly...
> >
> > new openscad needed an update to opencsg.
> > new pokerth needed libircclient. pokerth is very interesting, will fwd to
> > friends who are into this texas hold'em poker :)
>
> Missing update-desktop-database + rundep on desktop-file-utils in
> openscad - There shouldnt be those PaxHeaders dirs in pokerth PLIST, use
> gtar.
> Does those updates work with the older boost and can be commited now, or
> it needs to be done simultaneously ?
>
> Landry
>
attached the openscad+ pokerth with Landry's feedback. thanks for catching that.
no changes in opencsg.diff and libircclient.diff, attached for completeness.
libircclient.diff
Description: Binary data
opencsg.diff
Description: Binary data
openscad_rev2.diff
Description: Binary data
pokerth_rev2.diff
Description: Binary data
Re: boost 1.52.0 status
On Sat, Jan 19, 2013 at 1:30 AM, Landry Breuil wrote:
> On Fri, Jan 18, 2013 at 05:00:49PM -0600, Amit Kulkarni wrote:
>> > > >> openscad fails to build. Please take a look into this.
>> > > >
>> > > > and pokerth
>> > > >
>> > >
>> > > i am in the process of getting my ancient amd64 box updated. so is it
>> > > ok to try to update openscad and pokerth to latest released versions?
>> > > i don't want to patch in a zillion places, i assume authors *must*
>> > > have patched to work with latest boost.
>> >
>> > If an update can be done then try to do so. That is preferred.
>>
>> find attached...
>>
>> a license issue in new port net/libircclient, what is the license?
>>
>> in ${WRKSRC}/LICENSE says LGPLv2+, but in all of ${WRKSRC}/src/*.c, it says
>> LGPLv3+. please adjust accordingly...
>>
>> new openscad needed an update to opencsg.
>> new pokerth needed libircclient. pokerth is very interesting, will fwd to
>> friends who are into this texas hold'em poker :)
>
> Missing update-desktop-database + rundep on desktop-file-utils in
> openscad - There shouldnt be those PaxHeaders dirs in pokerth PLIST, use
> gtar.
ok will do.
> Does those updates work with the older boost and can be commited now, or
> it needs to be done simultaneously ?
simultaneously with new boost.
Re: boost 1.52.0 status
On Fri, Jan 18, 2013 at 05:00:49PM -0600, Amit Kulkarni wrote:
> > > >> openscad fails to build. Please take a look into this.
> > > >
> > > > and pokerth
> > > >
> > >
> > > i am in the process of getting my ancient amd64 box updated. so is it
> > > ok to try to update openscad and pokerth to latest released versions?
> > > i don't want to patch in a zillion places, i assume authors *must*
> > > have patched to work with latest boost.
> >
> > If an update can be done then try to do so. That is preferred.
>
> find attached...
>
> a license issue in new port net/libircclient, what is the license?
>
> in ${WRKSRC}/LICENSE says LGPLv2+, but in all of ${WRKSRC}/src/*.c, it says
> LGPLv3+. please adjust accordingly...
>
> new openscad needed an update to opencsg.
> new pokerth needed libircclient. pokerth is very interesting, will fwd to
> friends who are into this texas hold'em poker :)
Missing update-desktop-database + rundep on desktop-file-utils in
openscad - There shouldnt be those PaxHeaders dirs in pokerth PLIST, use
gtar.
Does those updates work with the older boost and can be commited now, or
it needs to be done simultaneously ?
Landry
Re: boost 1.52.0 status
On Fri, Jan 18, 2013 at 12:22:05PM -0600, Amit Kulkarni wrote: > >> > > I already have Boost in my own tree. > >> > > > >> > > I don't want one big diff. I want a diff per port. > >> > > > >> > >> openscad fails to build. Please take a look into this. > > > > and pokerth > > > > i am in the process of getting my ancient amd64 box updated. so is it > ok to try to update openscad and pokerth to latest released versions? > i don't want to patch in a zillion places, i assume authors *must* > have patched to work with latest boost. If an update can be done then try to do so. That is preferred. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: boost 1.52.0 status
>> > > I already have Boost in my own tree. >> > > >> > > I don't want one big diff. I want a diff per port. >> > > >> >> openscad fails to build. Please take a look into this. > > and pokerth > i am in the process of getting my ancient amd64 box updated. so is it ok to try to update openscad and pokerth to latest released versions? i don't want to patch in a zillion places, i assume authors *must* have patched to work with latest boost.
Re: boost 1.52.0 status
On 2013/01/17 10:10, Brad Smith wrote: > On Sun, Jan 13, 2013 at 11:57:19AM -0600, Amit Kulkarni wrote: > > > > > > I already have Boost in my own tree. > > > > > > I don't want one big diff. I want a diff per port. > > > > > openscad fails to build. Please take a look into this. and pokerth
Re: boost 1.52.0 status
On Sun, Jan 13, 2013 at 11:57:19AM -0600, Amit Kulkarni wrote: > > > > I already have Boost in my own tree. > > > > I don't want one big diff. I want a diff per port. > > openscad fails to build. Please take a look into this. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: boost 1.52.0 status
On Mon, Jan 14, 2013 at 09:14:58AM -0600, Amit Kulkarni wrote: > >> > I already have Boost in my own tree. > >> > > >> > I don't want one big diff. I want a diff per port. > >> > > >> > >> attached. > > > > Looking at these diffs it looks as if there are some > > changes mixed in which are not directly related to > > adjusting for the Boost update alone. > > > > aqsis: looks like it is switching from FLTK to Qt4. > > Yep, they changed GUIs in 1.8.0 which was broken, it is on their > website. Instead of trying to patch the old port my philosophy was, > try the update first, if it was easy and as it usually took care of > latest boost, then that was the way to go. This takes care of the > boost update too. > > > cgal: curious about the WRKDIST addition. > > they bumped the version but the extracted folder is still reflecting > older version, so I had to define it like that. how did that one slip > through the cracks? OK. I guess those are all fine then. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: boost 1.52.0 status
>> > I already have Boost in my own tree. >> > >> > I don't want one big diff. I want a diff per port. >> > >> >> attached. > > Looking at these diffs it looks as if there are some > changes mixed in which are not directly related to > adjusting for the Boost update alone. > > aqsis: looks like it is switching from FLTK to Qt4. Yep, they changed GUIs in 1.8.0 which was broken, it is on their website. Instead of trying to patch the old port my philosophy was, try the update first, if it was easy and as it usually took care of latest boost, then that was the way to go. This takes care of the boost update too. > cgal: curious about the WRKDIST addition. they bumped the version but the extracted folder is still reflecting older version, so I had to define it like that. how did that one slip through the cracks?
Re: boost 1.52.0 status
On Sun, Jan 13, 2013 at 11:57:19AM -0600, Amit Kulkarni wrote: > > > > I already have Boost in my own tree. > > > > I don't want one big diff. I want a diff per port. > > > > attached. Looking at these diffs it looks as if there are some changes mixed in which are not directly related to adjusting for the Boost update alone. aqsis: looks like it is switching from FLTK to Qt4. cgal: curious about the WRKDIST addition. Can you comment on those? The rest looks OK to me. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: boost 1.52.0 status
> > I already have Boost in my own tree. > > I don't want one big diff. I want a diff per port. > attached. aqsis.diff Description: Binary data ardour.diff Description: Binary data cgal.diff Description: Binary data enblend-enfuse.diff Description: Binary data frogatto.diff Description: Binary data mkvtoolnix.diff Description: Binary data mongodb.diff Description: Binary data pinot.diff Description: Binary data
Re: boost 1.52.0 status
On Wed, Jan 09, 2013 at 06:10:07PM -0600, Amit Kulkarni wrote: > >> > > 1) I need help porting databases/mongodb to a newer version. The older > >> > > version will need too many patches. Any volunteers for that? Mongodb > >> > > is cloud! So make OpenBSD cloudy. > > this is marked as BROKEN per fgsch@ suggestion. > > >> > > 2) for geo/merkaartor, it needs qt4 to be patched. many linux distro's > >> > > have the same patch... Vadim has already patched automoc4 in wip with > >> > > a similar patch... other similar patches mentioned in boost TODO in > >> > > wip. > >> > > > >> > > http://pkgs.fedoraproject.org/cgit/qt.git/tree/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch?id=f0ce6564e29e22eac504c538698517bdcef80061;id2=060db3c767b670dc1e168252644c937abc9fe607 > >> > > > > this would need to be fixed. espie@ will you please look into the fix in qt4? > > a one liner fix. > > diff -ur qt-everywhere-opensource-src-4.8.0/src/tools/moc/main.cpp > qt-everywhere-opensource-src-4.8.0-moc-boost148/src/tools/moc/main.cpp > --- qt-everywhere-opensource-src-4.8.0/src/tools/moc/main.cpp 2011-10-04 > 05:44:32.0 +0200 > +++ qt-everywhere-opensource-src-4.8.0-moc-boost148/src/tools/moc/main.cpp > 2011-12-04 > 00:11:25.0 +0100 > @@ -187,6 +187,7 @@ > Moc moc; > pp.macros["Q_MOC_RUN"]; > pp.macros["__cplusplus"]; > +pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; // rh#756395 > QByteArray filename; > QByteArray output; > FILE *in = 0; > > >> > > 3) games/pokerth needs to be updated to 0.9.5 with a new port of > >> > > textproc/tinyxml (old pokerth has too many patches in too many places) > >> > > > >> > > http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/ports/textproc/tinyxml/Makefile?rev=1.13;content-type=text%2Fplain > >> > > http://www.freshports.org/games/pokerth/ > >> > > > >> > > I will do it next weekend. If somebody else wants to do it, great! > > this would need to be updated. i didn't get time to update it over the > holidays, and antoine already ported textproc/tinyxml (thanks!). > > > Can you please provide me a list of all of the ports that need something > > done with them to be able to accommodate this Boost update? As in a port > > by port basis tell me if there is a patch pending somewhere or what needs > > to be done whether it is an update or if you think it can be patched for. > > If there are patches pending send them to me. I won't look at stuff in > > this openbsd-wip. > > here is the attached diff against current. cd /usr/ports && cvs di > -Nup devel/boost graphics/aqsis > brad.diff etc based on a idea from > stuart. > > basically 2 fixes (geo/merkaartor + games/pokerth) needed on top of > this new boost update AFAIK, there might be others lurking in the > tree. new kde4 which vadim plans to import already works with newer > boost, he fixed automoc4 with the same fix as the proposed patch for > qt4 above, which fixes geo/merkaartor. > > Libreoffice 3.6.3.2 tested fine with new boost 1.52.0 I already have Boost in my own tree. I don't want one big diff. I want a diff per port. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: boost 1.52.0 status
On Thu, January 10, 2013 03:10, Amit Kulkarni wrote: >>> > > 1) I need help porting databases/mongodb to a newer version. The older >>> > > version will need too many patches. Any volunteers for that? Mongodb >>> > > is cloud! So make OpenBSD cloudy. > > this is marked as BROKEN per fgsch@ suggestion. > >>> > > 2) for geo/merkaartor, it needs qt4 to be patched. many linux distro's Hi. Latetst version of merkaartor (0.18.1) doesn't require boost. I think I can send patch for tests in day or two. >>> > > have the same patch... Vadim has already patched automoc4 in wip with >>> > > a similar patch... other similar patches mentioned in boost TODO in >>> > > wip. >>> > > >>> > > http://pkgs.fedoraproject.org/cgit/qt.git/tree/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch?id=f0ce6564e29e22eac504c538698517bdcef80061;id2=060db3c767b670dc1e168252644c937abc9fe607 >>> > > > > this would need to be fixed. espie@ will you please look into the fix in qt4? > > a one liner fix. > > diff -ur qt-everywhere-opensource-src-4.8.0/src/tools/moc/main.cpp > qt-everywhere-opensource-src-4.8.0-moc-boost148/src/tools/moc/main.cpp > --- qt-everywhere-opensource-src-4.8.0/src/tools/moc/main.cpp 2011-10-04 > 05:44:32.0 +0200 > +++ > qt-everywhere-opensource-src-4.8.0-moc-boost148/src/tools/moc/main.cpp > 2011-12-04 > 00:11:25.0 +0100 > @@ -187,6 +187,7 @@ > Moc moc; > pp.macros["Q_MOC_RUN"]; > pp.macros["__cplusplus"]; > +pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; // rh#756395 > QByteArray filename; > QByteArray output; > FILE *in = 0; > >>> > > 3) games/pokerth needs to be updated to 0.9.5 with a new port of >>> > > textproc/tinyxml (old pokerth has too many patches in too many places) >>> > > >>> > > http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/ports/textproc/tinyxml/Makefile?rev=1.13;content-type=text%2Fplain >>> > > http://www.freshports.org/games/pokerth/ >>> > > >>> > > I will do it next weekend. If somebody else wants to do it, great! > > this would need to be updated. i didn't get time to update it over the > holidays, and antoine already ported textproc/tinyxml (thanks!). > >> Can you please provide me a list of all of the ports that need something >> done with them to be able to accommodate this Boost update? As in a port >> by port basis tell me if there is a patch pending somewhere or what needs >> to be done whether it is an update or if you think it can be patched for. >> If there are patches pending send them to me. I won't look at stuff in >> this openbsd-wip. > > here is the attached diff against current. cd /usr/ports && cvs di > -Nup devel/boost graphics/aqsis > brad.diff etc based on a idea from > stuart. > > basically 2 fixes (geo/merkaartor + games/pokerth) needed on top of > this new boost update AFAIK, there might be others lurking in the > tree. new kde4 which vadim plans to import already works with newer > boost, he fixed automoc4 with the same fix as the proposed patch for > qt4 above, which fixes geo/merkaartor. > > Libreoffice 3.6.3.2 tested fine with new boost 1.52.0 >
Re: boost 1.52.0 status
On Fri, Nov 23, 2012 at 11:06 PM, Amit Kulkarni wrote: > Hi all > > 1) I need help porting databases/mongodb to a newer version. The older > version will need too many patches. Any volunteers for that? Mongodb > is cloud! So make OpenBSD cloudy. I will take a look but as I said privately don't worry too much about it. It's sorta broken since we switched to rthreads so if this is holding you just mark it as broken for the time being. f.-
Re: boost 1.52.0 status
On Sat, Dec 15, 2012 at 06:02:16AM -0500, Brad Smith wrote: > On Mon, Dec 10, 2012 at 12:06:57AM -0500, Brad Smith wrote: > > On Fri, Nov 23, 2012 at 05:06:46PM -0600, Amit Kulkarni wrote: > > > Hi all > > > > > > 1) I need help porting databases/mongodb to a newer version. The older > > > version will need too many patches. Any volunteers for that? Mongodb > > > is cloud! So make OpenBSD cloudy. > > > > > > 2) for geo/merkaartor, it needs qt4 to be patched. many linux distro's > > > have the same patch... Vadim has already patched automoc4 in wip with > > > a similar patch... other similar patches mentioned in boost TODO in > > > wip. > > > > > > http://pkgs.fedoraproject.org/cgit/qt.git/tree/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch?id=f0ce6564e29e22eac504c538698517bdcef80061;id2=060db3c767b670dc1e168252644c937abc9fe607 > > > > > > 3) games/pokerth needs to be updated to 0.9.5 with a new port of > > > textproc/tinyxml (old pokerth has too many patches in too many places) > > > > > > http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/ports/textproc/tinyxml/Makefile?rev=1.13;content-type=text%2Fplain > > > http://www.freshports.org/games/pokerth/ > > > > > > I will do it next weekend. If somebody else wants to do it, great! > > > > > > 4) all other patches are in wip as mentioned here > > > https://github.com/jasperla/openbsd-wip/blob/master/devel/boost/TODO > > > > > > all other ports in the cvs tree which have a devel/boost in Makefile > > > build and package fine. this includes kde3 as of last week, before > > > vadim's imports of kde3 into wip. > > > > Here is an updated diff against -current. > > Further updated for -current and includes the patch mentioned by Amit. Amit, Can you please provide me a list of all of the ports that need something done with them to be able to accommodate this Boost update? As in a port by port basis tell me if there is a patch pending somewhere or what needs to be done whether it is an update or if you think it can be patched for. If there are patches pending send them to me. I won't look at stuff in this openbsd-wip. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: Parallel cmake (was: Re: boost 1.52.0 status)
On Tue, 11 Dec 2012, Brad Smith wrote:
> The use of GNU make like this seems bogus. I take it CMake
> isn't doing something right.
Hi,
I've found another (related) problem.
$MAKE_PROGRAM is not honored and cmake picks gmake up if it's
installed (even without USE_GMAKE=Yes).
>From cmake-2.8.10.2/bootstrap:
---8<---
CMAKE_KNOWN_MAKE_PROCESSORS="gmake make"
...
# If MAKE is set, use that for make processor, otherwise use list of known make
if [ -n "${MAKE}" ]; then
cmake_make_processors="${MAKE}"
else
cmake_make_processors="${CMAKE_KNOWN_MAKE_PROCESSORS}"
fi
---8<---
Ok for the diff below?
I've also added "--parallel=${MAKE_JOBS}" to CONFIGURE_ARGS.
I still need to investigate the make vs. gmake parallelization
issues...
cheers,
David
Index: Makefile
===
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.73
diff -u -p -r1.73 Makefile
--- Makefile11 Dec 2012 11:51:39 - 1.73
+++ Makefile12 Dec 2012 05:52:46 -
@@ -8,7 +8,7 @@ HOMEPAGE = http://www.cmake.org/
CATEGORIES = devel
COMMENT = portable build system
DISTNAME = cmake-2.8.10.2
-REVISION = 0
+REVISION = 1
MASTER_SITES = ${HOMEPAGE}files/v2.8/
MAINTAINER = David Coppa
@@ -29,7 +29,9 @@ CONFIGURE_STYLE = simple
CONFIGURE_ARGS = --prefix=${PREFIX} \
--datadir=/share/cmake \
--docdir=/share/doc/cmake \
- --system-libs
+ --system-libs \
+ --parallel=${MAKE_JOBS}
+CONFIGURE_ENV =MAKE="${MAKE_PROGRAM}"
PORTHOME = ${WRKDIR}
Re: boost 1.52.0 status
> > > what about having DPB_PROPERTIES=parallel ? > > > > Not sure about that. Someone else who is familiar with this feature should > > comment as to whether it should be added or not. > > You run a build with MAKE_JOBS=1 and one with MAKE_JOBS=2 (or better 4 > if you have the hardware) and compare the build times. If it sorta, > kinda scales, we enable DPB_PROPERTIES=parallel. > > The last time I checked boost it scarled poorly enough that I thought > enabling the parallel build wasn't worth it, but I don't remember > the figures. results are in... MAKE_JOBS=1 22m44.71s real18m7.76s user 2m43.81s system ===> Cleaning for boost-1.52.0p1 MAKE_JOBS=2 12m52.11s real18m24.61s user 3m51.25s system ===> Cleaning for boost-1.52.0p1 MAKE_JOBS=4 8m17.98s real19m8.27s user 6m3.54s system ===> Cleaning for boost-1.52.0p1 so yes, it does provide a "boost" :-) this is with a cpu0: Intel(R) Xeon(R) CPU E3-1220 V2 @ 3.10GHz, 3093.39 MHz
Re: Parallel cmake (was: Re: boost 1.52.0 status)
>> > > I tried with USE_GMAKE = Yes and it drives all cores
>> > >
>> > > so I think please add CONFIGURE_ARGS = --parallel=${MAKE_JOBS} and
>> > > USE_GMAKE = Yes and then both configure and build will go parallel.
>> > >
>> >
>> > Please just let me know what should I do, because I know nothing about
>> > DPB and related stuff (yet)
>>
>> Ok, apply this diff
>>
>> ? cmake.diff
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/devel/cmake/Makefile,v
>> retrieving revision 1.73
>> diff -u -p -r1.73 Makefile
>> --- Makefile 11 Dec 2012 11:51:39 - 1.73
>> +++ Makefile 11 Dec 2012 19:06:41 -
>> @@ -8,7 +8,7 @@ HOMEPAGE =http://www.cmake.org/
>> CATEGORIES = devel
>> COMMENT =portable build system
>> DISTNAME = cmake-2.8.10.2
>> -REVISION = 0
>> +REVISION = 1
>> MASTER_SITES = ${HOMEPAGE}files/v2.8/
>>
>> MAINTAINER = David Coppa
>> @@ -29,12 +29,16 @@ CONFIGURE_STYLE = simple
>> CONFIGURE_ARGS = --prefix=${PREFIX} \
>> --datadir=/share/cmake \
>> --docdir=/share/doc/cmake \
>> - --system-libs
>> + --system-libs \
>> + --parallel=${MAKE_JOBS}
>>
>> PORTHOME = ${WRKDIR}
>>
>> SEPARATE_BUILD = Yes
>> USE_GROFF = Yes
>> +
>> +# gmake enables dpb parallel build
>> +USE_GMAKE = Yes
>>
>> REGRESS_TARGET = test
>
> The use of GNU make like this seems bogus. I take it CMake
> isn't doing something right.
as far back as 2008 I seem to remember cmake having implicit
dependency on gmake (i tried it on on Solaris,FreeBSD and then
OpenBSD). my builds would always parallel build with gmake but not
with plain os make. i still haven't figured out why. maybe david can
chime in with more...
perhaps
http://cmake.3232098.n2.nabble.com/parallel-make-j-N-td7193296.html
which leads to
http://public.kitware.com/Bug/view.php?id=12882
Re: Parallel cmake (was: Re: boost 1.52.0 status)
On Tue, Dec 11, 2012 at 01:22:27PM -0600, Amit Kulkarni wrote:
> > >> Which does absolutely nothing. MAKE_JOBS has no effect on cmake.
> > >> The build is strictly sequential.
> > >>
> > >> You can parallelize the bootstrap phase with
> > >> CONFIGURE_ARGS += --parallel=${MAKE_JOBS}
> > >> but the main build remains sequential so the overall gain is
> > >> negligible.
> > >>
> > >> I haven't been able to figure out how to get cmake to build things
> > >> in parallel, but then I'm largely unfamiliar with cmake.
> > >
> > > in cmake based builds when you cd WRKOBJDIR and do a gmake -j4 it
> > > usually works in driving all cores to utilization.
> > >
> > > I tried with USE_GMAKE = Yes and it drives all cores
> > >
> > > so I think please add CONFIGURE_ARGS = --parallel=${MAKE_JOBS} and
> > > USE_GMAKE = Yes and then both configure and build will go parallel.
> > >
> >
> > Please just let me know what should I do, because I know nothing about
> > DPB and related stuff (yet)
>
> Ok, apply this diff
>
> ? cmake.diff
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/cmake/Makefile,v
> retrieving revision 1.73
> diff -u -p -r1.73 Makefile
> --- Makefile 11 Dec 2012 11:51:39 - 1.73
> +++ Makefile 11 Dec 2012 19:06:41 -
> @@ -8,7 +8,7 @@ HOMEPAGE =http://www.cmake.org/
> CATEGORIES = devel
> COMMENT =portable build system
> DISTNAME = cmake-2.8.10.2
> -REVISION = 0
> +REVISION = 1
> MASTER_SITES = ${HOMEPAGE}files/v2.8/
>
> MAINTAINER = David Coppa
> @@ -29,12 +29,16 @@ CONFIGURE_STYLE = simple
> CONFIGURE_ARGS = --prefix=${PREFIX} \
> --datadir=/share/cmake \
> --docdir=/share/doc/cmake \
> - --system-libs
> + --system-libs \
> + --parallel=${MAKE_JOBS}
>
> PORTHOME = ${WRKDIR}
>
> SEPARATE_BUILD = Yes
> USE_GROFF = Yes
> +
> +# gmake enables dpb parallel build
> +USE_GMAKE = Yes
>
> REGRESS_TARGET = test
The use of GNU make like this seems bogus. I take it CMake
isn't doing something right.
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: Parallel cmake (was: Re: boost 1.52.0 status)
> >> Which does absolutely nothing. MAKE_JOBS has no effect on cmake.
> >> The build is strictly sequential.
> >>
> >> You can parallelize the bootstrap phase with
> >> CONFIGURE_ARGS += --parallel=${MAKE_JOBS}
> >> but the main build remains sequential so the overall gain is
> >> negligible.
> >>
> >> I haven't been able to figure out how to get cmake to build things
> >> in parallel, but then I'm largely unfamiliar with cmake.
> >
> > in cmake based builds when you cd WRKOBJDIR and do a gmake -j4 it
> > usually works in driving all cores to utilization.
> >
> > I tried with USE_GMAKE = Yes and it drives all cores
> >
> > so I think please add CONFIGURE_ARGS = --parallel=${MAKE_JOBS} and
> > USE_GMAKE = Yes and then both configure and build will go parallel.
> >
>
> Please just let me know what should I do, because I know nothing about
> DPB and related stuff (yet)
Ok, apply this diff
? cmake.diff
Index: Makefile
===
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.73
diff -u -p -r1.73 Makefile
--- Makefile11 Dec 2012 11:51:39 - 1.73
+++ Makefile11 Dec 2012 19:06:41 -
@@ -8,7 +8,7 @@ HOMEPAGE = http://www.cmake.org/
CATEGORIES = devel
COMMENT = portable build system
DISTNAME = cmake-2.8.10.2
-REVISION = 0
+REVISION = 1
MASTER_SITES = ${HOMEPAGE}files/v2.8/
MAINTAINER = David Coppa
@@ -29,12 +29,16 @@ CONFIGURE_STYLE = simple
CONFIGURE_ARGS = --prefix=${PREFIX} \
--datadir=/share/cmake \
--docdir=/share/doc/cmake \
- --system-libs
+ --system-libs \
+ --parallel=${MAKE_JOBS}
PORTHOME = ${WRKDIR}
SEPARATE_BUILD = Yes
USE_GROFF =Yes
+
+# gmake enables dpb parallel build
+USE_GMAKE =Yes
REGRESS_TARGET = test
then use this in a .sh file (watch amd64/i386 etc... or use machine) and
observe if all cores are used with top
subst 4 with real cores you have i.e hw.ncpu
rm -rf /usr/ports/logs/amd64/locks/*
rm -rf /usr/ports/pobj/locks/*
/usr/ports/infrastructure/bin/dpb -j 4 -p 4 -u -U -R -J 10 devel/cmake
Re: Parallel cmake (was: Re: boost 1.52.0 status)
On Tue, Dec 11, 2012 at 7:59 PM, Amit Kulkarni wrote:
>> Which does absolutely nothing. MAKE_JOBS has no effect on cmake.
>> The build is strictly sequential.
>>
>> You can parallelize the bootstrap phase with
>> CONFIGURE_ARGS += --parallel=${MAKE_JOBS}
>> but the main build remains sequential so the overall gain is
>> negligible.
>>
>> I haven't been able to figure out how to get cmake to build things
>> in parallel, but then I'm largely unfamiliar with cmake.
>
> in cmake based builds when you cd WRKOBJDIR and do a gmake -j4 it
> usually works in driving all cores to utilization.
>
> I tried with USE_GMAKE = Yes and it drives all cores
>
> so I think please add CONFIGURE_ARGS = --parallel=${MAKE_JOBS} and
> USE_GMAKE = Yes and then both configure and build will go parallel.
>
Please just let me know what should I do, because I know nothing about
DPB and related stuff (yet)
ciao,
david
Re: Parallel cmake (was: Re: boost 1.52.0 status)
> Which does absolutely nothing. MAKE_JOBS has no effect on cmake.
> The build is strictly sequential.
>
> You can parallelize the bootstrap phase with
> CONFIGURE_ARGS += --parallel=${MAKE_JOBS}
> but the main build remains sequential so the overall gain is
> negligible.
>
> I haven't been able to figure out how to get cmake to build things
> in parallel, but then I'm largely unfamiliar with cmake.
in cmake based builds when you cd WRKOBJDIR and do a gmake -j4 it
usually works in driving all cores to utilization.
I tried with USE_GMAKE = Yes and it drives all cores
so I think please add CONFIGURE_ARGS = --parallel=${MAKE_JOBS} and
USE_GMAKE = Yes and then both configure and build will go parallel.
Parallel cmake (was: Re: boost 1.52.0 status)
David Coppa wrote:
> If ok, I will add [DPB_PROPERTIES=parallel] to cmake.
Which does absolutely nothing. MAKE_JOBS has no effect on cmake.
The build is strictly sequential.
You can parallelize the bootstrap phase with
CONFIGURE_ARGS += --parallel=${MAKE_JOBS}
but the main build remains sequential so the overall gain is
negligible.
I haven't been able to figure out how to get cmake to build things
in parallel, but then I'm largely unfamiliar with cmake.
--
Christian "naddy" Weisgerber na...@mips.inka.de
Re: boost 1.52.0 status
>> > what about having DPB_PROPERTIES=parallel ? >> >> Not sure about that. Someone else who is familiar with this feature should >> comment as to whether it should be added or not. > > You run a build with MAKE_JOBS=1 and one with MAKE_JOBS=2 (or better 4 > if you have the hardware) and compare the build times. If it sorta, > kinda scales, we enable DPB_PROPERTIES=parallel. > > The last time I checked boost it scarled poorly enough that I thought > enabling the parallel build wasn't worth it, but I don't remember > the figures. i will try running with values of 1, 2 and 4 with a rm -rf /usr/ports/pobj/.ccache/ and report.
Re: boost 1.52.0 status
Brad Smith wrote: > > what about having DPB_PROPERTIES=parallel ? > > Not sure about that. Someone else who is familiar with this feature should > comment as to whether it should be added or not. You run a build with MAKE_JOBS=1 and one with MAKE_JOBS=2 (or better 4 if you have the hardware) and compare the build times. If it sorta, kinda scales, we enable DPB_PROPERTIES=parallel. The last time I checked boost it scarled poorly enough that I thought enabling the parallel build wasn't worth it, but I don't remember the figures. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: boost 1.52.0 status
>>> > what about having DPB_PROPERTIES=parallel ? >>> >>> Not sure about that. Someone else who is familiar with this feature should >>> comment as to whether it should be added or not. >> >> I've done at least half a dozen builds with boost 1.42.0 marked that way >> without any problems, it is on the critical path for libreoffice in a bulk >> package build and takes a fair amount of time to build, I am OK with this. >> (Likewise for devel/cmake). > > If ok, I will add it to cmake. please, it takes time for a new cmake to build, and it unlocks all of kde4. likewise a DPB_PARALLEL is needed for kdelibs4.
Re: boost 1.52.0 status
On Mon, Dec 10, 2012 at 10:56 PM, Stuart Henderson wrote: > On 2012/12/10 13:21, Brad Smith wrote: >> On Mon, Dec 10, 2012 at 08:04:41AM -0600, Amit Kulkarni wrote: >> > what about having DPB_PROPERTIES=parallel ? >> >> Not sure about that. Someone else who is familiar with this feature should >> comment as to whether it should be added or not. > > I've done at least half a dozen builds with boost 1.42.0 marked that way > without any problems, it is on the critical path for libreoffice in a bulk > package build and takes a fair amount of time to build, I am OK with this. > (Likewise for devel/cmake). If ok, I will add it to cmake. Ciao, David
Re: boost 1.52.0 status
On 2012/12/10 13:21, Brad Smith wrote: > On Mon, Dec 10, 2012 at 08:04:41AM -0600, Amit Kulkarni wrote: > > what about having DPB_PROPERTIES=parallel ? > > Not sure about that. Someone else who is familiar with this feature should > comment as to whether it should be added or not. I've done at least half a dozen builds with boost 1.42.0 marked that way without any problems, it is on the critical path for libreoffice in a bulk package build and takes a fair amount of time to build, I am OK with this. (Likewise for devel/cmake).
Re: boost 1.52.0 status
On Mon, Dec 10, 2012 at 12:56:20PM -0600, Amit Kulkarni wrote: > > > >> what about having DPB_PROPERTIES=parallel ? > > > > Not sure about that. Someone else who is familiar with this feature should > > comment as to whether it should be added or not. > > It allows parallel builds, it maxes out at -j N -p N, if you use dpb > (I have a quad core so I use N=4). Otherwise by default it uses -j 2. > Uses the MAKE_JOBS variable in Boost Makefile. Well I know that much. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: boost 1.52.0 status
On Mon, Dec 10, 2012 at 12:21 PM, Brad Smith wrote:
> On Mon, Dec 10, 2012 at 08:04:41AM -0600, Amit Kulkarni wrote:
>> > Index: patches/patch-boost_interprocess_detail_transform_iterator_hpp
>> > ===
>> > RCS file: patches/patch-boost_interprocess_detail_transform_iterator_hpp
>> > diff -N patches/patch-boost_interprocess_detail_transform_iterator_hpp
>> > --- patches/patch-boost_interprocess_detail_transform_iterator_hpp 15
>> > Oct 2012 20:31:59 - 1.1
>> > +++ /dev/null 1 Jan 1970 00:00:00 -
>> > @@ -1,12 +0,0 @@
>> > -$OpenBSD: patch-boost_interprocess_detail_transform_iterator_hpp,v 1.1
>> > 2012/10/15 20:31:59 robert Exp $
>> > boost/interprocess/detail/transform_iterator.hpp.orig Sat Oct 13
>> > 12:35:34 2012
>> > -+++ boost/interprocess/detail/transform_iterator.hpp Sat Oct 13
>> > 12:35:40 2012
>> > -@@ -54,7 +54,7 @@ struct operator_arrow_proxy
>> > -// This function is needed for MWCW and BCC, which won't call
>> > operator->
>> > -// again automatically per 13.3.1.2 para 8
>> > - // operator T*() const { return &m_value; }
>> > -- mutable T &m_value;
>> > -+ T &m_value;
>> > - };
>> > -
>> > - template
>>
>> This patch won't apply because this patch is upstreamed already in
>> previous releases of boost. Please drop this patch otherwise it will
>> fail make patch.
>
> That's why the patch is being removed as your original diff did.
big foot-in-the-mouth moment!!! sorry, i didn't see the /dev/null
>> There's a missing patch, please add this and then boost will be
>> updated properly.
>> https://github.com/jasperla/openbsd-wip/commit/6d95c78201d16f0f95ab391b221aad37736b86d5
>
> If you come up with any other patches please send them directly to me.
sure. thanks
>
>> what about having DPB_PROPERTIES=parallel ?
>
> Not sure about that. Someone else who is familiar with this feature should
> comment as to whether it should be added or not.
It allows parallel builds, it maxes out at -j N -p N, if you use dpb
(I have a quad core so I use N=4). Otherwise by default it uses -j 2.
Uses the MAKE_JOBS variable in Boost Makefile.
Re: boost 1.52.0 status
On Mon, Dec 10, 2012 at 08:04:41AM -0600, Amit Kulkarni wrote:
> > Index: patches/patch-boost_interprocess_detail_transform_iterator_hpp
> > ===
> > RCS file: patches/patch-boost_interprocess_detail_transform_iterator_hpp
> > diff -N patches/patch-boost_interprocess_detail_transform_iterator_hpp
> > --- patches/patch-boost_interprocess_detail_transform_iterator_hpp 15
> > Oct 2012 20:31:59 - 1.1
> > +++ /dev/null 1 Jan 1970 00:00:00 -
> > @@ -1,12 +0,0 @@
> > -$OpenBSD: patch-boost_interprocess_detail_transform_iterator_hpp,v 1.1
> > 2012/10/15 20:31:59 robert Exp $
> > boost/interprocess/detail/transform_iterator.hpp.orig Sat Oct 13
> > 12:35:34 2012
> > -+++ boost/interprocess/detail/transform_iterator.hpp Sat Oct 13 12:35:40
> > 2012
> > -@@ -54,7 +54,7 @@ struct operator_arrow_proxy
> > -// This function is needed for MWCW and BCC, which won't call
> > operator->
> > -// again automatically per 13.3.1.2 para 8
> > - // operator T*() const { return &m_value; }
> > -- mutable T &m_value;
> > -+ T &m_value;
> > - };
> > -
> > - template
>
> This patch won't apply because this patch is upstreamed already in
> previous releases of boost. Please drop this patch otherwise it will
> fail make patch.
That's why the patch is being removed as your original diff did.
> There's a missing patch, please add this and then boost will be
> updated properly.
> https://github.com/jasperla/openbsd-wip/commit/6d95c78201d16f0f95ab391b221aad37736b86d5
If you come up with any other patches please send them directly to me.
> what about having DPB_PROPERTIES=parallel ?
Not sure about that. Someone else who is familiar with this feature should
comment as to whether it should be added or not.
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: boost 1.52.0 status
> Index: patches/patch-boost_interprocess_detail_transform_iterator_hpp
> ===
> RCS file: patches/patch-boost_interprocess_detail_transform_iterator_hpp
> diff -N patches/patch-boost_interprocess_detail_transform_iterator_hpp
> --- patches/patch-boost_interprocess_detail_transform_iterator_hpp 15
> Oct 2012 20:31:59 - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-boost_interprocess_detail_transform_iterator_hpp,v 1.1
> 2012/10/15 20:31:59 robert Exp $
> boost/interprocess/detail/transform_iterator.hpp.orig Sat Oct 13
> 12:35:34 2012
> -+++ boost/interprocess/detail/transform_iterator.hpp Sat Oct 13 12:35:40
> 2012
> -@@ -54,7 +54,7 @@ struct operator_arrow_proxy
> -// This function is needed for MWCW and BCC, which won't call operator->
> -// again automatically per 13.3.1.2 para 8
> - // operator T*() const { return &m_value; }
> -- mutable T &m_value;
> -+ T &m_value;
> - };
> -
> - template
This patch won't apply because this patch is upstreamed already in
previous releases of boost. Please drop this patch otherwise it will
fail make patch.
There's a missing patch, please add this and then boost will be
updated properly.
https://github.com/jasperla/openbsd-wip/commit/6d95c78201d16f0f95ab391b221aad37736b86d5
what about having DPB_PROPERTIES=parallel ?
boost 1.52.0 status
Hi all 1) I need help porting databases/mongodb to a newer version. The older version will need too many patches. Any volunteers for that? Mongodb is cloud! So make OpenBSD cloudy. 2) for geo/merkaartor, it needs qt4 to be patched. many linux distro's have the same patch... Vadim has already patched automoc4 in wip with a similar patch... other similar patches mentioned in boost TODO in wip. http://pkgs.fedoraproject.org/cgit/qt.git/tree/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch?id=f0ce6564e29e22eac504c538698517bdcef80061;id2=060db3c767b670dc1e168252644c937abc9fe607 3) games/pokerth needs to be updated to 0.9.5 with a new port of textproc/tinyxml (old pokerth has too many patches in too many places) http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/ports/textproc/tinyxml/Makefile?rev=1.13;content-type=text%2Fplain http://www.freshports.org/games/pokerth/ I will do it next weekend. If somebody else wants to do it, great! 4) all other patches are in wip as mentioned here https://github.com/jasperla/openbsd-wip/blob/master/devel/boost/TODO all other ports in the cvs tree which have a devel/boost in Makefile build and package fine. this includes kde3 as of last week, before vadim's imports of kde3 into wip. thanks
