diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2017-08-22 03:33:22 +0200 |
|---|---|---|
| committer | Dave Reisner <dreisner@archlinux.org> | 2017-08-22 03:33:22 +0200 |
| commit | 32dbf895d07f07e32d2b3bb4afb132eea1919749 (patch) | |
| tree | ab2b1f40f79666190e710e042b4f420d97514d4f | |
| parent | 172ca644527cfaf3bba1dbeab9e7139cca2b249a (diff) | |
| download | mkinitcpio-32dbf895d07f07e32d2b3bb4afb132eea1919749.tar.gz mkinitcpio-32dbf895d07f07e32d2b3bb4afb132eea1919749.tar.xz | |
make ldd parsing compatible with upstream glibc changes
https://sourceware.org/git/?p=glibc.git;a=commit;h=eedca9772e99c72ab4c3c34e43cc764250aa3e3c
| -rw-r--r-- | functions | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -598,10 +598,10 @@ add_binary() { ! lddout=$(ldd "$binary" 2>/dev/null) && return 0 # resolve sodeps - regex='(/.+) \(0x[a-fA-F0-9]+\)' - while read line; do + regex='^(|.+ )(/.+) \(0x[a-fA-F0-9]+\)' + while read -r line; do if [[ $line =~ $regex ]]; then - sodep=${BASH_REMATCH[1]} + sodep=${BASH_REMATCH[2]} elif [[ $line = *'not found' ]]; then error "binary dependency \`%s' not found for \`%s'" "${line%% *}" "$1" (( ++_builderrors )) |