From 37fe7f743f5dd9fd5557d5b99489c4a98e720e0d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 22 Nov 2018 00:03:05 +0100 Subject: fix collecting needed perl files with glibc-2.26 basically the ouput of strace changed with glibc-2.26: "Since version 2.26, the glibc wrapper function for open() employs the openat() system call, rather than the kernel's open() system call". so support both ways (in case it would be backported): open("foobar...) openat(AT_FDCWD, "foobar...) --- tools/install-xml-file-list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/install-xml-file-list b/tools/install-xml-file-list index 0fc8f7a76..64c70b9c6 100755 --- a/tools/install-xml-file-list +++ b/tools/install-xml-file-list @@ -160,7 +160,7 @@ sub collect_needed_perl_files { my (%local, %global); foreach my $script (@scripts) { foreach (`strace -efile perl -cw -I$local_rep $script 2>&1`) { - my ($f) = /^open\("(.*?)",.*\)\s*=\s*\d+$/ or next; + my ($f) = /^open(?:at\([^,]*, |)"(.*?)",.*\)\s*=\s*\d+$/ or next; if ($f =~ m!^\Q$local_rep\E/(.*)!) { $local{$1} = 1; } elsif (begins_with($f, '/dev/')) { -- cgit v1.2.1