Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r9582 - main/branches/prefix/bin
Date: Fri, 28 Mar 2008 21:18:08
Message-Id: E1JfLxd-0004MM-OV@stork.gentoo.org
1 Author: grobian
2 Date: 2008-03-28 21:18:04 +0000 (Fri, 28 Mar 2008)
3 New Revision: 9582
4
5 Modified:
6 main/branches/prefix/bin/misc-functions.sh
7 Log:
8 Fix cause of bug #215116. Properly read input from scanelf such that we don't interpret rpath info as needed info
9
10 Modified: main/branches/prefix/bin/misc-functions.sh
11 ===================================================================
12 --- main/branches/prefix/bin/misc-functions.sh 2008-03-28 20:29:24 UTC (rev 9581)
13 +++ main/branches/prefix/bin/misc-functions.sh 2008-03-28 21:18:04 UTC (rev 9582)
14 @@ -160,9 +160,9 @@
15 fi
16
17 # Save NEEDED information after removing self-contained providers
18 - scanelf -qyRF '%p:%r %n' "${D}" | sed -e 's:^:/:' | { while read l; do
19 + scanelf -qyRF '%p:%r %n' "${D}" | sed -e 's:^:/:' | { while IFS= read l; do
20 obj=${l%%:*}
21 - rpath=${l##*:}; rpath=${rpath%% *}
22 + rpath=${l#*:}; rpath=${rpath% *}
23 needed=${l##* }
24 if [ -z "${rpath}" -o -n "${rpath//*ORIGIN*}" ]; then
25 # object doesn't contain $ORIGIN in its runpath attribute
26
27 --
28 gentoo-commits@l.g.o mailing list