Remove directory from rpath, initial support for dots in --python-buildid option. Patch by Arfrever

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

4 files changed, 153 insertions, 1 deletions

diff --git a/dev-util/boost-build/ChangeLog b/dev-util/boost-build/ChangeLog
index 6467dd4f338f..b1b2f8bd78e1 100644
--- a/dev-util/boost-build/ChangeLog
+++ b/dev-util/boost-build/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/boost-build
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.80 2012/01/08 10:43:10 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.81 2012/01/19 22:40:07 hwoarang Exp $
+
+*boost-build-1.48.0-r1 (19 Jan 2012)
+
+  19 Jan 2012; Markos Chandras <hwoarang@gentoo.org>
+  +boost-build-1.48.0-r1.ebuild,
+  +files/boost-build-1.48.0-disable_python_rpath.patch,
+  +files/boost-build-1.48.0-support_dots_in_python-buildid.patch:
+  Remove directory used for searching of libpythonX.Y.so from rpath of all
+  libraries, which would occur in some situations. Initial support for dots in
+  argument of --python-buildid option. Patch by Arfrever
 
 *boost-build-1.48.0 (08 Jan 2012)
 
diff --git a/dev-util/boost-build/boost-build-1.48.0-r1.ebuild b/dev-util/boost-build/boost-build-1.48.0-r1.ebuild
new file mode 100644
index 000000000000..8815aa3ad295
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.48.0-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.48.0-r1.ebuild,v 1.1 2012/01/19 22:40:07 hwoarang Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? *"
+
+inherit eutils flag-o-matic python toolchain-funcs versionator
+
+MY_PV=$(replace_all_version_separators _)
+MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
+
+DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
+HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="examples python"
+
+DEPEND="!<dev-libs/boost-1.34.0
+	!<=dev-util/boost-build-1.35.0-r1"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/boost_${MY_PV}/tools/build/v2"
+
+src_unpack() {
+	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-support_dots_in_python-buildid.patch"
+	epatch "${FILESDIR}/${P}-disable_python_rpath.patch"
+
+	# Remove stripping option
+	cd "${S}/engine"
+	sed -i -e 's|-s\b||' \
+		build.jam || die "sed failed"
+
+	# Force regeneration
+	rm jambase.c || die
+
+	# This patch allows us to fully control optimization
+	# and stripping flags when bjam is used as build-system
+	# We simply extend the optimization and debug-symbols feature
+	# with empty dummies called 'none'
+	cd "${S}"
+	sed -i \
+		-e 's/\(off speed space\)/\1 none/' \
+		-e 's/\(debug-symbols      : on off\)/\1 none/' \
+		tools/builtin.jam || die "sed failed"
+}
+
+src_compile() {
+	cd engine
+	local toolset
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		toolset=darwin
+	else
+		# Using boost's generic toolset here, which respects CC and CFLAGS
+		toolset=cc
+	fi
+
+	# For slotting
+	sed -i \
+		-e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \
+		Jambase || die "sed failed"
+
+	# The build.jam file for building bjam using a bootstrapped jam0 ignores
+	# the LDFLAGS env var (bug #209794). We have now two options:
+	# a) change the cc-target definition in build.jam to include separate compile
+	#    and link targets to make it use the LDFLAGS var, or
+	# b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var
+	#    (which should not be set by us).
+	if [[ -z "${LDFLAGS}" ]] ; then
+		CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \
+			|| die "building bjam failed"
+	else
+		LDFLAGS=$(echo ${LDFLAGS}) # 293652
+		LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \
+			$(use_with python) || die "building bjam failed"
+	fi
+}
+
+src_install() {
+	newbin engine/bin.*/bjam bjam-${MAJOR_PV}
+	newbin engine/bin.*/b2 b2-${MAJOR_PV}
+
+	cd "${S}"
+	insinto /usr/share/boost-build-${MAJOR_PV}
+	doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \
+		build kernel options tools util || die
+
+	dodoc changes.txt hacking.txt release_procedure.txt \
+		notes/build_dir_option.txt notes/relative_source_paths.txt
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r example
+	fi
+}
+
+src_test() {
+	cd test/engine
+
+	# FIXME: Replace the ls call with the proper way of doing this.
+
+	BJAM_BIN=$(ls ../../engine/bin.*/b2)
+	${BJAM_BIN} -f test.jam "-sBJAM=${BJAM_BIN}" || die "tests failed"
+}
diff --git a/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch b/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch
new file mode 100644
index 000000000000..8b88b43f3d2f
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch
@@ -0,0 +1,11 @@
+--- tools/python.jam
++++ tools/python.jam
+@@ -961,7 +961,7 @@
+             # linux).
+           : $(usage-requirements)
+             <testing.launcher>$(set-PYTHONPATH)
+-              <library-path>$(libraries) <dll-path>$(dll-path) <library>python.lib
++              <library-path>$(libraries) <library>python.lib
+           ;
+     }
+ 
diff --git a/dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch b/dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch
new file mode 100644
index 000000000000..b3bee03b56f3
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch
@@ -0,0 +1,19 @@
+--- tools/common.jam
++++ tools/common.jam
+@@ -759,7 +759,15 @@
+         switch $(f:G)
+         {
+             case <base> :
+-                result += $(name:B) ;
++                local matched = [ MATCH "^(boost.*python)-.*" : $(name) ] ;
++                if $(matched) = boost_python || $(matched) = boost_mpi_python
++                {
++                    result += $(name) ;
++                }
++                else
++                {
++                    result += $(name:B) ;
++                }
+             
+             case <toolset> :
+                 result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) :