Added python USE-flag. Adding LDFLAGS to LIBS to fix bug #209794 (see ebuild for...

Package-Manager: portage-2.1.4.4

diff --git a/dev-util/boost-build/ChangeLog b/dev-util/boost-build/ChangeLog
index e7035de918faf05790a7eba90e0e21f43b667704..a383f958c70a7f685da3998658d981b3de7812f2 100644 (file)
--- a/dev-util/boost-build/ChangeLog
+++ b/dev-util/boost-build/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/boost-build
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.19 2008/02/05 15:40:06 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.20 2008/02/13 14:03:16 dev-zero Exp $
+
+  13 Feb 2008; Tiziano Müller <dev-zero@gentoo.org>
+  boost-build-1.34.1.ebuild:
+  Added python USE-flag. Adding LDFLAGS to LIBS to fix bug #209794 (see ebuild
+  for more info).
 
   05 Feb 2008; Samuli Suominen <drac@gentoo.org> boost-build-1.34.1.ebuild:
   amd64 stable wrt security #205955

diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 5c5b451698c50e36fe6470fffd519b8812570f4d..570d66d1726a223839bcacf294a01dfeef84a913 100644 (file)
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -1,4 +1,4 @@
 DIST boost_1_34_1.tar.bz2 12986931 RMD160 303327ff852bc19dd7a94657fdef3c56f5882e06 SHA1 b771271d5cbd3bdb0f119dd66dfd36bad7a66866 SHA256 0f866c75b025a4f1340117a106595cc0675f48ba1e5a9b5c221ec7f19e96ec4c
-EBUILD boost-build-1.34.1.ebuild 1807 RMD160 70471ddb27d0bcfc563de9fbd34f537f1d99a7f1 SHA1 f1033658b95e82daf03bfd12973d1d45fd9f449b SHA256 01034b78e072641f89e2aa6ef12401462827987b5ca758c7c6cb6a47f072d302
-MISC ChangeLog 2518 RMD160 a022a9df43c37470c7860110d5dfe06679b74985 SHA1 1d31e275e5c30ff34fa361f4b82255dec9f6b71c SHA256 088bbe2d71f13f72f2fd71f64253528386b8e15df3e897ade30fa1d39684bc6e
+EBUILD boost-build-1.34.1.ebuild 2273 RMD160 0114e37ed1752889ecd1d09cee285d68bce9e9f8 SHA1 d3d5ec46a06dd35c805fb24fb5d75107def6f380 SHA256 635cd10c8a37589e892f09cca53c92296d750eede48abcde385ad647ab88c476
+MISC ChangeLog 2702 RMD160 56330f556770afe7df81d91661954054d6896489 SHA1 cbb689b0d2be1d34c81da7d5b02b22a9875a3089 SHA256 ce9d178abc36572b20a0ba2e2e834ebec6fa1b78da792e06bcdd11697dfbc955
 MISC metadata.xml 261 RMD160 5334f981ef24f0e2d90bbf1fc1acfa0861684476 SHA1 9c795ec41d3c4c6c284fc88f292ae04c23083f56 SHA256 3207c8a2b1789cb857ab68170ddb6d4e9e4f970e4a110119e62e7fac0b9f6ddb

diff --git a/dev-util/boost-build/boost-build-1.34.1.ebuild b/dev-util/boost-build/boost-build-1.34.1.ebuild
index 4ee98863f1ab567841fbbd330c9de0160f52bc79..c13d7f71e3f9f259f3e8e094ddde1c18fec8424f 100644 (file)
--- a/dev-util/boost-build/boost-build-1.34.1.ebuild
+++ b/dev-util/boost-build/boost-build-1.34.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.34.1.ebuild,v 1.10 2008/02/05 15:40:06 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.34.1.ebuild,v 1.11 2008/02/13 14:03:16 dev-zero Exp $
 
 inherit flag-o-matic toolchain-funcs versionator
 
@@ -13,9 +13,10 @@ SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
 LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
+IUSE="python"
 
-DEPEND="!<dev-libs/boost-1.34.0"
+DEPEND="!<dev-libs/boost-1.34.0
+       python? ( dev-lang/python )"
 RDEPEND=""
 
 S=${WORKDIR}/boost_${MY_PV}/tools
@@ -53,7 +54,13 @@ src_compile() {
 
        append-flags -fno-strict-aliasing
 
-       CC=$(tc-getCC) ./build.sh ${toolset} || die "building bjam 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).
+       LIBS="${LDFLAGS}" CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) || die "building bjam failed"
 }
 
 src_install() {