| 1 |
commit: f1399e6802a2cbda7be459b3fb20b9db7fcdf586 |
| 2 |
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 1 17:38:37 2016 +0000 |
| 4 |
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 1 17:39:36 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1399e68 |
| 7 |
|
| 8 |
dev-libs/boost-1.55.0-r1: Backport fix for python ABI letters |
| 9 |
|
| 10 |
Also backport cross-compiler support |
| 11 |
|
| 12 |
Reported-by: Nikolaos Chatzidakis <nikhatzi <AT> hotmail.com> |
| 13 |
Gentoo-Bug: 578354 |
| 14 |
Gentoo-Bug: 565090 |
| 15 |
|
| 16 |
Package-Manager: portage-2.3.0_rc1 |
| 17 |
|
| 18 |
dev-libs/boost/boost-1.55.0-r2.ebuild | 17 +++++++++++++++-- |
| 19 |
1 file changed, 15 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-libs/boost/boost-1.55.0-r2.ebuild b/dev-libs/boost/boost-1.55.0-r2.ebuild |
| 22 |
index a9e1cda..a3aa6bf 100644 |
| 23 |
--- a/dev-libs/boost/boost-1.55.0-r2.ebuild |
| 24 |
+++ b/dev-libs/boost/boost-1.55.0-r2.ebuild |
| 25 |
@@ -1,4 +1,4 @@ |
| 26 |
-# Copyright 1999-2015 Gentoo Foundation |
| 27 |
+# Copyright 1999-2016 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
# $Id$ |
| 30 |
|
| 31 |
@@ -75,7 +75,20 @@ create_user-config.jam() { |
| 32 |
fi |
| 33 |
|
| 34 |
if python_bindings_needed; then |
| 35 |
- python_configuration="using python : : ${PYTHON} ;" |
| 36 |
+ # boost expects libpython$(pyver) and doesn't allow overrides |
| 37 |
+ # and the build system is so creepy that it's easier just to |
| 38 |
+ # provide a symlink (linker's going to use SONAME anyway) |
| 39 |
+ # TODO: replace it with proper override one day |
| 40 |
+ ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die |
| 41 |
+ |
| 42 |
+ if tc-is-cross-compiler; then |
| 43 |
+ python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;" |
| 44 |
+ else |
| 45 |
+ # note: we need to provide version explicitly because of |
| 46 |
+ # a bug in the build system: |
| 47 |
+ # https://github.com/boostorg/build/pull/104 |
| 48 |
+ python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;" |
| 49 |
+ fi |
| 50 |
fi |
| 51 |
|
| 52 |
cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ |
Archives