summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-01-06 13:32:59 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-01-06 13:32:59 +0000
commitcb2c1741008ee6df9c1599b65d4c0de392a52ab8 (patch)
tree22d6b922f6838e254adde201b58b9309407af009
parenteee827b16be8458ac50dabb9d96aecff513d0391 (diff)
downloadabuild-cb2c1741008ee6df9c1599b65d4c0de392a52ab8.tar.gz
abuild-cb2c1741008ee6df9c1599b65d4c0de392a52ab8.tar.bz2
abuild-cb2c1741008ee6df9c1599b65d4c0de392a52ab8.tar.xz
abuild-cb2c1741008ee6df9c1599b65d4c0de392a52ab8.zip
abuild: filter out empty lines when scanning for SO dependencies
This works around a bug in busybox 1.22.0 that makes 'grep -w ^' hang. It is triggered when there are no deps. (eg. musl)
-rwxr-xr-xabuild.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/abuild.in b/abuild.in
index fa3971a..3a904f6 100755
--- a/abuild.in
+++ b/abuild.in
@@ -1077,7 +1077,7 @@ scan_shared_objects() {
# now find the so dependencies
scanelf --nobanner --recursive --needed "$datadir" | tr ' ' ':' \
- | awk -F ":" '$1 == "ET_DYN" || $1 == "ET_EXEC" {print $2}' \
+ | awk -F ":" '$2 != "" && ($1 == "ET_DYN" || $1 == "ET_EXEC") {print $2}' \
| sed 's:,:\n:g' | sort -u \
| while read soname; do
# only add files that are not self provided