diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-07-07 19:19:25 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-07-07 19:19:25 +0000 |
| commit | 3926cbd3d95783498563b6b29d39d76e713d36c2 (patch) | |
| tree | 798d334e9f6d09b56b1fe686dc60f85c4ab49779 | |
| parent | Fix build failure with Boost 1.50. Patch by Arfrever. (diff) | |
| download | gentoo-2-3926cbd3d95783498563b6b29d39d76e713d36c2.tar.gz gentoo-2-3926cbd3d95783498563b6b29d39d76e713d36c2.tar.bz2 gentoo-2-3926cbd3d95783498563b6b29d39d76e713d36c2.zip | |
Fix build failure with Boost 1.50. Patch by Arfrever.
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
| -rw-r--r-- | dev-python/visual/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-python/visual/files/visual-5.74-boost-1.50.patch | 28 | ||||
| -rw-r--r-- | dev-python/visual/visual-5.74.ebuild | 6 |
3 files changed, 37 insertions, 4 deletions
diff --git a/dev-python/visual/ChangeLog b/dev-python/visual/ChangeLog index 0923c608c642..2e7746b7959b 100644 --- a/dev-python/visual/ChangeLog +++ b/dev-python/visual/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/visual # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/ChangeLog,v 1.60 2012/06/18 15:38:51 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/ChangeLog,v 1.61 2012/07/07 19:19:25 floppym Exp $ + + 07 Jul 2012; Mike Gilbert <floppym@gentoo.org> + +files/visual-5.74-boost-1.50.patch, visual-5.74.ebuild: + Fix build failure with Boost 1.50. Patch by Arfrever. 18 Jun 2012; Mike Gilbert <floppym@gentoo.org> visual-5.74.ebuild: Remove workarounds due to changes in build system upstream. Thanks Arfrever. @@ -248,4 +252,3 @@ 01 Jun 2005; <tercel@gentoo.org> +metadata.xml, +visual-3.2.1.ebuild: Initial commit. - diff --git a/dev-python/visual/files/visual-5.74-boost-1.50.patch b/dev-python/visual/files/visual-5.74-boost-1.50.patch new file mode 100644 index 000000000000..a66ded258987 --- /dev/null +++ b/dev-python/visual/files/visual-5.74-boost-1.50.patch @@ -0,0 +1,28 @@ +https://github.com/vpython/visual/issues/3 + +--- dependencies/threadpool/include/threadpool/task_adaptors.hpp ++++ dependencies/threadpool/include/threadpool/task_adaptors.hpp +@@ -135,7 +135,11 @@ + if(m_break_s > 0 || m_break_ns > 0) + { // Sleep some time before first execution + xtime xt; ++#if BOOST_VERSION >= 105000 ++ xtime_get(&xt, TIME_UTC_); ++#else + xtime_get(&xt, TIME_UTC); ++#endif + xt.nsec += m_break_ns; + xt.sec += m_break_s; + thread::sleep(xt); +@@ -146,7 +150,11 @@ + if(m_break_s > 0 || m_break_ns > 0) + { + xtime xt; ++#if BOOST_VERSION >= 105000 ++ xtime_get(&xt, TIME_UTC_); ++#else + xtime_get(&xt, TIME_UTC); ++#endif + xt.nsec += m_break_ns; + xt.sec += m_break_s; + thread::sleep(xt); diff --git a/dev-python/visual/visual-5.74.ebuild b/dev-python/visual/visual-5.74.ebuild index e2c458ee2fca..aee4e14bb694 100644 --- a/dev-python/visual/visual-5.74.ebuild +++ b/dev-python/visual/visual-5.74.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/visual-5.74.ebuild,v 1.2 2012/06/18 15:38:51 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/visual-5.74.ebuild,v 1.3 2012/07/07 19:19:25 floppym Exp $ EAPI="4" SUPPORT_PYTHON_ABIS="1" RESTRICT_PYTHON_ABIS="2.5 3.* *-jython 2.7-pypy-*" PYTHON_EXPORT_PHASE_FUNCTIONS="1" -inherit flag-o-matic multilib python versionator +inherit eutils flag-o-matic multilib python versionator MY_P="${PN}-$(delete_version_separator 2)_release" @@ -37,6 +37,8 @@ src_prepare() { -e 's/2\?>>[[:space:]]*\$(LOGFILE).*//' \ src/Makefile.in || die + epatch "${FILESDIR}/${P}-boost-1.50.patch" + python_clean_py-compile_files python_src_prepare |