aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik (Xarthisius) <xarthisius.kk@gmail.com>2011-08-15 15:39:29 +0200
committerKacper Kowalik (Xarthisius) <xarthisius.kk@gmail.com>2011-08-15 15:39:29 +0200
commitf3c1e9c276907c3f3aed5a9638e1d68f98ca4c90 (patch)
treec775d093736b48270675317e5d835c061fd3a211 /dev-lang
parentAdded sample configuration files to numbench. (diff)
downloadsci-f3c1e9c276907c3f3aed5a9638e1d68f98ca4c90.tar.gz
sci-f3c1e9c276907c3f3aed5a9638e1d68f98ca4c90.tar.bz2
sci-f3c1e9c276907c3f3aed5a9638e1d68f98ca4c90.zip
[dev-lang/path64] Apply fix for bug #377111, use direct path for crt1.o
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/path64/ChangeLog3
-rw-r--r--dev-lang/path64/Manifest4
-rw-r--r--dev-lang/path64/path64-9999.ebuild6
3 files changed, 8 insertions, 5 deletions
diff --git a/dev-lang/path64/ChangeLog b/dev-lang/path64/ChangeLog
index b462b718b..765e53b26 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/Manifest b/dev-lang/path64/Manifest
index 818595508..389bee431 100644
--- a/dev-lang/path64/Manifest
+++ b/dev-lang/path64/Manifest
@@ -1,3 +1,3 @@
-EBUILD path64-9999.ebuild 3637 RMD160 2a6b69d2cc992a1eaf5c0cc380ba487c1679062a SHA1 5c9fdc7f5094d9157b5b0178aaa751738d96bab0 SHA256 5a04225dc103d33a433373f0acb8361ff35d64f990218cb5f6df64873a757f6d
-MISC ChangeLog 2031 RMD160 239738d04d5922686e12e66975143ead188931a3 SHA1 22374a13dcee92fab2445c6e1e52dea69f2e00fe SHA256 25f66a4c72e3a57b81cc07c4648e84b9f934f83127cfe2c8b7e6b7e073d2a433
+EBUILD path64-9999.ebuild 3619 RMD160 dfb3a9b9b69704e77838292f520a509ce7d111d0 SHA1 3d5de5a33f041e7083bd94de24ec8128cb8c05ec SHA256 25fb5cce2b2a1bc0674dabe8e7c0dcd0f850f243a4e409188a7ef9499828ffdd
+MISC ChangeLog 2162 RMD160 d6df949d20e5f60010018c5c30d5ee7bf9d052f1 SHA1 ccc5d78c047cb3a621040f89a21b64e36bc4c831 SHA256 55e17baec47fdab846196c046d6fe2ffd5edf2d8fbc05c9b72e5e5fc40992c8e
MISC metadata.xml 723 RMD160 db0d2917268fd37e631f878b1f03b3d388a4b3f3 SHA1 fe4aaa16e9cb916611384197b4da25309cea3271 SHA256 91d773a1787cd749f0c98ce6bf088bf28e4dab3143d704afb5a7f3114f609c96
diff --git a/dev-lang/path64/path64-9999.ebuild b/dev-lang/path64/path64-9999.ebuild
index a2600b513..53eb72629 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)"