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