summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2011-07-31 07:46:21 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2011-07-31 07:46:21 +0000
commit3dadd8c639f7465c760d140393a78ec31a4f2eca (patch)
tree0b34bfe87e16432b79855c3f5a2c49010b619334 /dev-lang/path64
parentBlock texlive-latexextra-2010 too, they collide, bug #377019 by William Throwe (diff)
downloadhistorical-3dadd8c639f7465c760d140393a78ec31a4f2eca.tar.gz
historical-3dadd8c639f7465c760d140393a78ec31a4f2eca.tar.bz2
historical-3dadd8c639f7465c760d140393a78ec31a4f2eca.zip
Make search for linker more resilient. Fixes bug 377111. Thanks to Diego Elio Pettenò <flameeyes@gentoo.org>
Package-Manager: portage-2.2.0_alpha49/cvs/Linux x86_64
Diffstat (limited to 'dev-lang/path64')
-rw-r--r--dev-lang/path64/ChangeLog7
-rw-r--r--dev-lang/path64/Manifest14
-rw-r--r--dev-lang/path64/path64-1.0.0_pre20110729.ebuild5
3 files changed, 16 insertions, 10 deletions
diff --git a/dev-lang/path64/ChangeLog b/dev-lang/path64/ChangeLog
index 314597559534..30b1e77d4a7e 100644
--- a/dev-lang/path64/ChangeLog
+++ b/dev-lang/path64/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/path64
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/path64/ChangeLog,v 1.1 2011/07/29 17:40:49 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/path64/ChangeLog,v 1.2 2011/07/31 07:46:21 xarthisius Exp $
+
+ 31 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org>
+ path64-1.0.0_pre20110729.ebuild:
+ Make search for linker more resilient. Fixes bug 377111. Thanks to Diego Elio
+ Pettenò <flameeyes@gentoo.org>
*path64-1.0.0_pre20110729 (29 Jul 2011)
diff --git a/dev-lang/path64/Manifest b/dev-lang/path64/Manifest
index 734df12e5609..5b8438f1fe79 100644
--- a/dev-lang/path64/Manifest
+++ b/dev-lang/path64/Manifest
@@ -5,15 +5,15 @@ DIST path64-assembler-1.0.0_pre20110729.tbz2 1095691 RMD160 f8219984a891229d9932
DIST path64-compiler-1.0.0_pre20110729.tbz2 21209830 RMD160 d2c4f39632a977d0782db79d52cbebfa7fb3c0d7 SHA1 e85d750d2df82dba9e4abd98b20357f52d22f8cb SHA256 45c7e5f9028da91dfecfbd9c31f2d5a12d9121ad382871bbb0f99eae2414dcad
DIST path64-debugger-1.0.0_pre20110729.tbz2 304745 RMD160 92ba782f55623211478e5da1147097f1c28d70ec SHA1 dacd51b557216c280427ba8006ec4bde3d635697 SHA256 6131542c31210f02e40956de453b276638e0ad186ea2505a937f6ac682259129
DIST path64-suite-1.0.0_pre20110729.tbz2 9825 RMD160 e5e9f30de830ca95d295fdba2ca8be0bf0543c91 SHA1 2c89cce9873dcb843e922857766889034c14e614 SHA256 c432079f890ea59b9cb2a5cedcede7ed9c5d243b686bd21901dd0225a9731628
-EBUILD path64-1.0.0_pre20110729.ebuild 3057 RMD160 58c36c60f56e7dc8b95473b7017cd36fc0f2ad55 SHA1 a1bb567b03f0f3b9129aeae072a554f2ce8fc4f0 SHA256 aeac7ff2f3a37425d54d90d2ded41980b5d9c8db6be1a77ca4b4325cb1979576
-MISC ChangeLog 452 RMD160 de5d312ac9abc05037c850ad9b61ecdb4034dc32 SHA1 d27de8ed39f5096dafd3251fcfa12693d635dece SHA256 ef8c0adf29bd150da3bfcacb0bbb4b173e641612cb365cd433871b1116deb480
+EBUILD path64-1.0.0_pre20110729.ebuild 3088 RMD160 e8f014e767c19742a64584496d35c46280be3f76 SHA1 200f5f74cfaa7a95644d29ec0dd60d58fe64a847 SHA256 e93454d0e4f554d77a1ed41c50f5b1dd814c200679e003e360526988ba5ebba6
+MISC ChangeLog 656 RMD160 b89ff31df707e70072ef854ed78a1a4cf5a4c981 SHA1 bb1668847ccfd2b7458d2cf35efe65694b4e99a0 SHA256 710a44f4827d13e39751118f148793e5dc060ecbc9b1a7adce27f1d6420e7279
MISC metadata.xml 849 RMD160 993b553507091d2a2762d3cb18415b9b4efc32c8 SHA1 537a7e37fb4425b73b0d0dc3b85e0ab47230ce23 SHA256 f89cd2210b3382eabaad97998930acef62adeaf5dbdb3f6e675098294f993ece
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iJwEAQEIAAYFAk4y8KsACgkQIiMqcbOVdxT8/gP/YqlRnMq80wFVNt+G/8LTaQJC
-BCf3ijkDtXLLqo780AkqEbLZRbg2gvrFPEOSElh7ESXu8oJ4rpZh4/IeGXbLphsj
-1Q0qO0Dw31ObWawl0sdAldkOuqoaE4UqXcM5ozMifX0LaU30tTS9YRM7y5uv3xk9
-Xv5sCebKS3z+O2ubiv4=
-=GjzO
+iJwEAQEIAAYFAk41CFcACgkQIiMqcbOVdxSuGQP/WuVweeH6iaXaggWFIlcXd9yU
+zV07suXWOiBpLFBsM1XcWe4XFfzMbLDk/eEfyTPw6Ni5f/BWzOolMd1rQ+V4Pma5
+2Nyjn25WDuItfjB+XQXVkbEi01lV4hXxh93H75rV/9NQ+6Y0qC74VctNEzIZqxqQ
+tNFjqJJT3pzpIg4Z5yg=
+=2Pib
-----END PGP SIGNATURE-----
diff --git a/dev-lang/path64/path64-1.0.0_pre20110729.ebuild b/dev-lang/path64/path64-1.0.0_pre20110729.ebuild
index 86ac6d0813c2..e2d149d889a5 100644
--- a/dev-lang/path64/path64-1.0.0_pre20110729.ebuild
+++ b/dev-lang/path64/path64-1.0.0_pre20110729.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/path64/path64-1.0.0_pre20110729.ebuild,v 1.1 2011/07/29 17:40:49 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/path64/path64-1.0.0_pre20110729.ebuild,v 1.2 2011/07/31 07:46:21 xarthisius Exp $
EAPI=4
CMAKE_VERBOSE=1
@@ -48,7 +48,8 @@ src_prepare() {
}
src_configure() {
- local linker=$($(tc-getCC) --help -v 2>&1 >/dev/null | grep '\-dynamic\-linker' | cut -f7 -d' ')
+ local linker=$($(tc-getCC) --help -v 2>&1 >/dev/null | \
+ sed -n -e '/dynamic-linker/s:.* -dynamic-linker \([^ ]\+\) .*:\1:p')
local libgcc=$($(tc-getCC) -print-libgcc-file-name)
local crt=$($(tc-getCC) -print-file-name=crt1.o)
use custom-cflags && flags=(