From: Geoff M. <ub...@ge...> - 2009-11-28 14:33:19
|
On Thu, 2009-11-26 at 19:55 +0000, Martin Spott wrote: > Tim Moore wrote: > > Update of /var/cvs/SimGear-0.3/source/simgear/scene/material > > In directory baron.flightgear.org:/tmp/cvs-serv21713/simgear/scene/material > > > > Modified Files: > > Effect.cxx > > Log Message: > [...] > > +#include <boost/tr1/unordered_map.hpp> > > .... requiring to add yet another patch to the build procedure :-/ > > Martin. Hi Tim, As Martin says, this now requires another patch to use boost 1.34, but the patch is to only comment out this additional #include, since Effect.hxx is already included, which includes 'unordered_map'... My Patches: ~/fg/fg7/simgear/source$ cvs diff [snip] Index: simgear/scene/material/Effect.cxx =================================================================== RCS file: /var/cvs/SimGear-0.3/source/simgear/scene/material/Effect.cxx,v retrieving revision 1.29 diff -r1.29 Effect.cxx 33c33 < #include <boost/tr1/unordered_map.hpp> --- > // #include <boost/tr1/unordered_map.hpp> Index: simgear/scene/material/Effect.hxx =================================================================== RCS file: /var/cvs/SimGear-0.3/source/simgear/scene/material/Effect.hxx,v retrieving revision 1.9 diff -r1.9 Effect.hxx 22,23c22,27 < #include <boost/tr1/unordered_map.hpp> < --- > #include <boost/version.hpp> > #if BOOST_VERSION > 103401 > #include <boost/tr1/unordered_map.hpp> > #else > #include <tr1/unordered_map> // for <c++/4.2/tr1/unordered_map> > #endif [snip] You have left/returned configure.ac to - AX_BOOST_BASE([1.34.0]) Thanks for this... I hope you will apply the above... Regards, Geoff. |
From: Tim M. <ti...@re...> - 2009-11-29 17:01:08
|
On 11/28/2009 03:00 PM, Geoff McLane wrote: > On Thu, 2009-11-26 at 19:55 +0000, Martin Spott wrote: >> Tim Moore wrote: >>> Update of /var/cvs/SimGear-0.3/source/simgear/scene/material >>> In directory baron.flightgear.org:/tmp/cvs-serv21713/simgear/scene/material >>> >>> Modified Files: >>> Effect.cxx >>> Log Message: >> [...] >>> +#include <boost/tr1/unordered_map.hpp> >> >> .... requiring to add yet another patch to the build procedure :-/ >> >> Martin. > Hi Tim, > > As Martin says, this now requires another patch to use > boost 1.34, but the patch is to only comment out this > additional #include, since Effect.hxx is already included, > which includes 'unordered_map'... > > My Patches: ... > > I hope you will apply the above... > > Regards, > > Geoff. Instead, I've changed the required Boost version back to 1.37. I don't want to deal with the tr1-Boost compatibility myself. As far as I know 1.37 will build and run on the systems we're interested in. Tim |
From: Geoff M. <ub...@ge...> - 2009-12-01 14:45:03
|
On Sun, 2009-11-29 at 18:00 +0100, Tim Moore wrote: > Instead, I've changed the required Boost version back to 1.37. I don't > want > to deal with the tr1-Boost compatibility myself. As far as I know 1.37 > will > build and run on the systems we're interested in. > > Tim Now, no problem. I have found the setting of BOOST_ROOT to the path where I unpacked just the boost headers _ONLY_ works fine. I just added this 'export' to my 'buildfg' script, and the configure.ac macro AX_BOOST_BASE([1.37.0]) finds them ok, and thus no need for a boost compile and install. ;=)) Thanks... Geoff. |