blob: 3e700295d9bce37f31cdd603420765d96ae8c808 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
From 32dbf895d07f07e32d2b3bb4afb132eea1919749 Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Mon, 21 Aug 2017 21:33:22 -0400
Subject: [PATCH] make ldd parsing compatible with upstream glibc changes
https://sourceware.org/git/?p=glibc.git;a=commit;h=eedca9772e99c72ab4c3c34e43cc764250aa3e3c
---
functions | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/functions b/functions
index 0e1fe0f..941312f 100644
--- a/functions
+++ b/functions
@@ -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 ))
--
2.14.1
|