Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=11727a96926495fbd43cea510cab4523c7d7c289
commit 11727a96926495fbd43cea510cab4523c7d7c289 Author: Miklos Vajna <[email protected]> Date: Sun Oct 28 16:04:26 2012 +0100 boost-1.49.0-2-x86_64 - add patch to build with latest glibc, it can be dropped when we upgrade to a newer version - see https://bugzilla.redhat.com/show_bug.cgi?id=825039 diff --git a/source/devel-extra/boost/FrugalBuild b/source/devel-extra/boost/FrugalBuild index 3acb877..1f3d1ba 100644 --- a/source/devel-extra/boost/FrugalBuild +++ b/source/devel-extra/boost/FrugalBuild @@ -4,7 +4,7 @@ pkgname=boost pkgver=1.49.0 -pkgrel=1 +pkgrel=2 pkgdesc="Boost header files , examples and tools" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge python @@ -14,9 +14,10 @@ up2date="lynx -dump http://www.boost.org/users/download/|grep 'Current Release'| makedepends=('boost-jam>=3.1.20' 'python>=2.7' 'icu4c>=4.8' 'bzip2' 'zlib' 'openssl>=1.0.0') groups=('devel-extra') archs=('i686' 'x86_64') -source=(${source/-$pkgver/_${pkgver//./_}}) +source=(${source/-$pkgver/_${pkgver//./_}} boost-1.48.0-xtime.patch) _F_cd_path="${pkgname}_`echo $pkgver|tr . _`" -sha1sums=('26a52840e9d12f829e3008589abf0a925ce88524') +sha1sums=('26a52840e9d12f829e3008589abf0a925ce88524' \ + 'da221edd5d7d3f6917edb389cfca9f73791f46c0') subpkgs=("libboost" "libboost-static" "libboost-mpi") subdescs=('Boost libraries.' 'Boost libraries statically linked.' 'Boost MPI Interface.') diff --git a/source/devel-extra/boost/boost-1.48.0-xtime.patch b/source/devel-extra/boost/boost-1.48.0-xtime.patch new file mode 100644 index 0000000..fbf45f3 --- /dev/null +++ b/source/devel-extra/boost/boost-1.48.0-xtime.patch @@ -0,0 +1,69 @@ +diff -up boost_1_48_0/boost/thread/xtime.hpp\~ boost_1_48_0/boost/thread/xtime.hpp +--- boost_1_48_0/boost/thread/xtime.hpp~ 2008-06-18 15:01:08.000000000 +0200 ++++ boost_1_48_0/boost/thread/xtime.hpp 2012-05-24 20:45:18.000000000 +0200 +@@ -18,18 +18,6 @@ + + namespace boost { + +-enum xtime_clock_types +-{ +- TIME_UTC=1 +-// TIME_TAI, +-// TIME_MONOTONIC, +-// TIME_PROCESS, +-// TIME_THREAD, +-// TIME_LOCAL, +-// TIME_SYNC, +-// TIME_RESOLUTION +-}; +- + struct xtime + { + #if defined(BOOST_NO_INT64_T) +diff -up boost_1_48_0/libs/thread/src/pthread/timeconv.inl\~ boost_1_48_0/libs/thread/src/pthread/timeconv.inl +--- boost_1_48_0/libs/thread/src/pthread/timeconv.inl~ 2010-04-01 17:04:15.000000000 +0200 ++++ boost_1_48_0/libs/thread/src/pthread/timeconv.inl 2012-05-24 20:55:43.000000000 +0200 +@@ -20,8 +20,8 @@ + inline void to_time(int milliseconds, boost::xtime& xt) + { + int res = 0; +- res = boost::xtime_get(&xt, boost::TIME_UTC); +- BOOST_ASSERT(res == boost::TIME_UTC); (void)res; ++ res = boost::xtime_get(&xt, TIME_UTC); ++ BOOST_ASSERT(res == TIME_UTC); (void)res; + + xt.sec += (milliseconds / MILLISECONDS_PER_SECOND); + xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) * +@@ -56,8 +56,8 @@ + { + boost::xtime cur; + int res = 0; +- res = boost::xtime_get(&cur, boost::TIME_UTC); +- BOOST_ASSERT(res == boost::TIME_UTC); (void)res; ++ res = boost::xtime_get(&cur, TIME_UTC); ++ BOOST_ASSERT(res == TIME_UTC); (void)res; + + if (boost::xtime_cmp(xt, cur) <= 0) + { +@@ -87,8 +87,8 @@ + { + boost::xtime cur; + int res = 0; +- res = boost::xtime_get(&cur, boost::TIME_UTC); +- BOOST_ASSERT(res == boost::TIME_UTC); (void)res; ++ res = boost::xtime_get(&cur, TIME_UTC); ++ BOOST_ASSERT(res == TIME_UTC); (void)res; + + if (boost::xtime_cmp(xt, cur) <= 0) + milliseconds = 0; +@@ -109,8 +109,8 @@ + { + boost::xtime cur; + int res = 0; +- res = boost::xtime_get(&cur, boost::TIME_UTC); +- BOOST_ASSERT(res == boost::TIME_UTC); (void)res; ++ res = boost::xtime_get(&cur, TIME_UTC); ++ BOOST_ASSERT(res == TIME_UTC); (void)res; + + if (boost::xtime_cmp(xt, cur) <= 0) + microseconds = 0; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
