[gentoo-commits] proj/sci:master commit in: dev-lang/path64/

["Kacper Kowalik" <xarthisius@gentoo.org>]

commit:     f3c1e9c276907c3f3aed5a9638e1d68f98ca4c90
Author:     Kacper Kowalik (Xarthisius) <xarthisius.kk <AT> gmail <DOT> com>
AuthorDate: Mon Aug 15 13:39:29 2011 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 13:39:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f3c1e9c2

[dev-lang/path64] Apply fix for bug #377111, use direct path for crt1.o

---
 dev-lang/path64/ChangeLog          |    3 +++
 dev-lang/path64/path64-9999.ebuild |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev-lang/path64/ChangeLog b/dev-lang/path64/ChangeLog
index b462b71..765e53b 100644
--- a/dev-lang/path64/ChangeLog
+++ b/dev-lang/path64/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> path64-9999.ebuild:
+  Apply fix for bug #377111, use direct path for crt1.o
+
   29 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org>
   -path64-1.0.0_pre20110729.ebuild:
   Moved to g-x86

diff --git a/dev-lang/path64/path64-9999.ebuild b/dev-lang/path64/path64-9999.ebuild
index a2600b5..53eb726 100644
--- a/dev-lang/path64/path64-9999.ebuild
+++ b/dev-lang/path64/path64-9999.ebuild
@@ -71,9 +71,9 @@ 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=(
 			-DCMAKE_C_FLAGS="${CFLAGS}"
 			-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
@@ -102,7 +102,7 @@ src_configure() {
 		$(cmake-utils_use openmp PATH64_ENABLE_OPENMP)
 		$(cmake-utils_use debugger PATH64_ENABLE_PATHDB)
 		$(cmake-utils_use valgrind PATH64_ENABLE_VALGRIND)
-		-DPSC_CRT_PATH_x86_64=$(dirname ${crt})
+		-DPSC_CRT_PATH_x86_64=/usr/$(get_libdir)
 		-DPSC_CRTBEGIN_PATH=$(dirname ${libgcc})
 		-DPSC_DYNAMIC_LINKER_x86_64=${linker}
 		-DCMAKE_C_COMPILER="$(tc-getCC)"