| 1 |
floppym 12/04/02 00:53:01 |
| 2 |
|
| 3 |
Modified: boost-1.48.0-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix handling of mpi Python modules (bug #404253). Delete old patch. Backported from Progress Overlay. Patch by Arfrever. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha98/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 dev-libs/boost/boost-1.48.0-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/boost-1.48.0-r1.ebuild?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/boost-1.48.0-r1.ebuild?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/boost-1.48.0-r1.ebuild?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: boost-1.48.0-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.48.0-r1.ebuild,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- boost-1.48.0-r1.ebuild 14 Feb 2012 19:57:04 -0000 1.3 |
| 23 |
+++ boost-1.48.0-r1.ebuild 2 Apr 2012 00:53:01 -0000 1.4 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.48.0-r1.ebuild,v 1.3 2012/02/14 19:57:04 hwoarang Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.48.0-r1.ebuild,v 1.4 2012/04/02 00:53:01 floppym Exp $ |
| 29 |
|
| 30 |
EAPI="4" |
| 31 |
PYTHON_DEPEND="python? *" |
| 32 |
@@ -24,7 +24,7 @@ |
| 33 |
mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) |
| 34 |
sys-libs/zlib |
| 35 |
!!<=dev-libs/boost-1.35.0-r2 |
| 36 |
- >=app-admin/eselect-boost-0.3" |
| 37 |
+ >=app-admin/eselect-boost-0.4" |
| 38 |
DEPEND="${RDEPEND} |
| 39 |
>=dev-util/boost-build-1.48.0-r1:${SLOT}" |
| 40 |
|
| 41 |
@@ -127,12 +127,6 @@ |
| 42 |
epatch "${FILESDIR}/${P}-python_linking.patch" |
| 43 |
epatch "${FILESDIR}/${P}-disable_icu_rpath.patch" |
| 44 |
epatch "${FILESDIR}/remove-toolset-${PV}.patch" |
| 45 |
- |
| 46 |
- # This enables building the boost.random library with /dev/urandom support |
| 47 |
- if [[ -e /dev/urandom ]]; then |
| 48 |
- mkdir -p libs/random/build || die |
| 49 |
- cp "${FILESDIR}/random-Jamfile-${PV}" libs/random/build/Jamfile.v2 || die |
| 50 |
- fi |
| 51 |
} |
| 52 |
|
| 53 |
src_configure() { |
| 54 |
@@ -271,7 +265,7 @@ |
| 55 |
fi |
| 56 |
|
| 57 |
if use mpi && use python; then |
| 58 |
- _add_line "python=\"" |
| 59 |
+ _add_line "python_modules=\"" |
| 60 |
fi |
| 61 |
|
| 62 |
installation() { |
| 63 |
@@ -325,8 +319,20 @@ |
| 64 |
if use mpi; then |
| 65 |
mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die |
| 66 |
mv "${D}usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die |
| 67 |
- touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" || die |
| 68 |
- _add_line "$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so" |
| 69 |
+ cat << EOF > "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" || die |
| 70 |
+import sys |
| 71 |
+if sys.platform.startswith('linux'): |
| 72 |
+ import DLFCN |
| 73 |
+ flags = sys.getdlopenflags() |
| 74 |
+ sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL) |
| 75 |
+ from . import mpi |
| 76 |
+ sys.setdlopenflags(flags) |
| 77 |
+ del DLFCN, flags |
| 78 |
+else: |
| 79 |
+ from . import mpi |
| 80 |
+del sys |
| 81 |
+EOF |
| 82 |
+ _add_line "$(python_get_sitedir)/mpi.py:boost_${MAJOR_PV}.mpi" |
| 83 |
fi |
| 84 |
fi |
| 85 |
} |
| 86 |
|
| 87 |
|
| 88 |
|
| 89 |
1.238 dev-libs/boost/ChangeLog |
| 90 |
|
| 91 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/ChangeLog?rev=1.238&view=markup |
| 92 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/ChangeLog?rev=1.238&content-type=text/plain |
| 93 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/boost/ChangeLog?r1=1.237&r2=1.238 |
| 94 |
|
| 95 |
Index: ChangeLog |
| 96 |
=================================================================== |
| 97 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v |
| 98 |
retrieving revision 1.237 |
| 99 |
retrieving revision 1.238 |
| 100 |
diff -u -r1.237 -r1.238 |
| 101 |
--- ChangeLog 14 Feb 2012 19:57:04 -0000 1.237 |
| 102 |
+++ ChangeLog 2 Apr 2012 00:53:01 -0000 1.238 |
| 103 |
@@ -1,6 +1,10 @@ |
| 104 |
# ChangeLog for dev-libs/boost |
| 105 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 106 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.237 2012/02/14 19:57:04 hwoarang Exp $ |
| 107 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.238 2012/04/02 00:53:01 floppym Exp $ |
| 108 |
+ |
| 109 |
+ 02 Apr 2012; Mike Gilbert <floppym@g.o> boost-1.48.0-r1.ebuild: |
| 110 |
+ Fix handling of mpi Python modules (bug #404253). Delete old patch. Backported |
| 111 |
+ from Progress Overlay. Patch by Arfrever. |
| 112 |
|
| 113 |
14 Feb 2012; Markos Chandras <hwoarang@g.o> boost-1.48.0-r1.ebuild: |
| 114 |
update header per bug #403671 |
Archives