[PATCH] Fix dependency generator

Richard W.M. Jones rjones at redhat.com
Tue Apr 21 08:36:39 UTC 2009


These patches are by Thomas Sailer.  They fix the case where a library
name contains a '+' character.

Comments before I apply them?

Rich.

-- 
Richard Jones, Emerging Technologies, Red Hat  http://et.redhat.com/~rjones
New in Fedora 11: Fedora Windows cross-compiler. Compile Windows
programs, test, and build Windows installers. Over 70 libraries supprt'd
http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw
-------------- next part --------------
--- mingw32-find-requires.sh	2009-04-21 07:23:24.000000000 +0200
+++ mingw32-find-requires.sh	2009-04-21 07:23:49.000000000 +0200
@@ -22,7 +22,7 @@
 dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$')
 
 for f in $dlls; do
-    $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._[:alnum:]]+\.dll' |
+    $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._\+[:alnum:]]+\.dll' |
         tr [:upper:] [:lower:] |
         sed 's/\(.*\)/mingw32(\1)/'
 done | sort -u
-------------- next part --------------
--- nsiswrapper	2009-04-21 07:27:31.000000000 +0200
+++ nsiswrapper	2009-04-21 07:27:49.000000000 +0200
@@ -443,7 +443,7 @@
     if (m/\.exe$/i || m/\.dll$/i) {
 	my $cmd = "$objdump -p '$file' |
                    grep 'DLL Name:' |
-                   grep -Eo '[-._[:alnum:]]+\.dll' |
+                   grep -Eo '[-._\+[:alnum:]]+\.dll' |
                    sort -u"; # XXX quoting
 	open DEPS, "$cmd |" or die "$cmd: $!";
 	foreach (<DEPS>) {


More information about the mingw mailing list