1 |
commit: f930e2fafd14705e548637330cfc2d848c102cfa |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 1 21:17:14 2012 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 1 21:17:14 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f930e2fa |
7 |
|
8 |
prepstrip: avoid duplicates for bug #445336 |
9 |
|
10 |
This prevents us from trying to hardlink duplicate splitdebug files, |
11 |
avoiding ln "File exists" failure as reported in bug #445336. |
12 |
|
13 |
--- |
14 |
bin/ebuild-helpers/prepstrip | 6 ++++-- |
15 |
1 files changed, 4 insertions(+), 2 deletions(-) |
16 |
|
17 |
diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip |
18 |
index 575001c..99acefb 100755 |
19 |
--- a/bin/ebuild-helpers/prepstrip |
20 |
+++ b/bin/ebuild-helpers/prepstrip |
21 |
@@ -247,8 +247,10 @@ while read -r x ; do |
22 |
inode_link=$(get_inode_number "${x}") || die "stat failed unexpectedly" |
23 |
echo "${x}" >> "${inode_link}" || die "echo failed unexpectedly" |
24 |
done < <( |
25 |
- scanelf -yqRBF '#k%F' -k '.symtab' "$@" |
26 |
- find "$@" -type f ! -type l -name '*.a' |
27 |
+ ( |
28 |
+ scanelf -yqRBF '#k%F' -k '.symtab' "$@" |
29 |
+ find "$@" -type f ! -type l -name '*.a' |
30 |
+ ) | LC_ALL=C sort -u |
31 |
) |
32 |
|
33 |
# Now we look for unstripped binaries. |