Fix bug #210029; thanks to Daniel Pielmeier <daniel.pielmeier AT googlemail DOT com>

Package-Manager: portage-2.1.4.4

diff --git a/dev-util/boost-build/ChangeLog b/dev-util/boost-build/ChangeLog
index a383f958c70a7f685da3998658d981b3de7812f2..c25eeaec9b5aaf9cbc60acbf2a680b2d4ceb3871 100644 (file)
--- a/dev-util/boost-build/ChangeLog
+++ b/dev-util/boost-build/ChangeLog
@@ -1,6 +1,10 @@
 # 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.20 2008/02/13 14:03:16 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.21 2008/02/14 03:22:45 halcy0n Exp $
+
+  14 Feb 2008; Mark Loeser <halcy0n@gentoo.org> boost-build-1.34.1.ebuild:
+  Fix bug #210029; thanks to Daniel Pielmeier <daniel.pielmeier AT googlemail
+  DOT com>
 
   13 Feb 2008; Tiziano Müller <dev-zero@gentoo.org>
   boost-build-1.34.1.ebuild:

diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 570d66d1726a223839bcacf294a01dfeef84a913..b23e634cf55a0cc31091c3a6ebf4ab0c294f7df6 100644 (file)
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST boost_1_34_1.tar.bz2 12986931 RMD160 303327ff852bc19dd7a94657fdef3c56f5882e06 SHA1 b771271d5cbd3bdb0f119dd66dfd36bad7a66866 SHA256 0f866c75b025a4f1340117a106595cc0675f48ba1e5a9b5c221ec7f19e96ec4c
-EBUILD boost-build-1.34.1.ebuild 2273 RMD160 0114e37ed1752889ecd1d09cee285d68bce9e9f8 SHA1 d3d5ec46a06dd35c805fb24fb5d75107def6f380 SHA256 635cd10c8a37589e892f09cca53c92296d750eede48abcde385ad647ab88c476
-MISC ChangeLog 2702 RMD160 56330f556770afe7df81d91661954054d6896489 SHA1 cbb689b0d2be1d34c81da7d5b02b22a9875a3089 SHA256 ce9d178abc36572b20a0ba2e2e834ebec6fa1b78da792e06bcdd11697dfbc955
+EBUILD boost-build-1.34.1.ebuild 2414 RMD160 b25149f78b49d57560d6ac451fcafb5de20b5d28 SHA1 25522970b69bb568308c53f188b9fc7d08ce4d29 SHA256 33264635c59ec88bb5a77288b2887f4472d84982255a356f2932097ea616b607
+MISC ChangeLog 2866 RMD160 37e0437e88fcbd42baa8cb577e58311d0d072a8b SHA1 a56ea5bc222d73a66966a82c37fdfbd8990bbd9d SHA256 da8ca8c2bff0a38b90ceea803d7c9233b064850ff978a2e3085a9c514ce7650c
 MISC metadata.xml 261 RMD160 5334f981ef24f0e2d90bbf1fc1acfa0861684476 SHA1 9c795ec41d3c4c6c284fc88f292ae04c23083f56 SHA256 3207c8a2b1789cb857ab68170ddb6d4e9e4f970e4a110119e62e7fac0b9f6ddb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHs7QPCRZPokWLroQRAv3hAJ4pXMXpWdSfBSnezZKYYmLytct9lwCggagK
+q6Rtmz7EDy+Xtvb57j85Th8=
+=LCPl
+-----END PGP SIGNATURE-----

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 c13d7f71e3f9f259f3e8e094ddde1c18fec8424f..734b55b2f61afe959a1dd4e64218e2c96c299e6a 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.11 2008/02/13 14:03:16 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.34.1.ebuild,v 1.12 2008/02/14 03:22:45 halcy0n Exp $
 
 inherit flag-o-matic toolchain-funcs versionator
 
@@ -60,7 +60,13 @@ src_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"
+       if [[ -z "${LDFLAGS}" ]] ; then
+               CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \
+                       || die "building bjam failed"
+       else
+               LIBS="${LDFLAGS}" CC=$(tc-getCC) ./build.sh ${toolset} \
+                       $(use_with python) || die "building bjam failed"
+       fi
 }
 
 src_install() {