[projects/cleanbuild] findbr match updates

glen glen at pld-linux.org
Sun Mar 16 02:06:21 CET 2014


commit 04173c407c4430662bd7953e755559e23933ce82
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Mar 16 03:00:59 2014 +0200

    findbr match updates

 findbr | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/findbr b/findbr
index ab68bbb..f23f564 100755
--- a/findbr
+++ b/findbr
@@ -331,13 +331,25 @@ while ( $_ = shift @lines ) {
 		poldek_file( "/usr/lib*/perl*/$mod", "/usr/share/perl*/$mod" );
 	}
 
-	if ( m{^(?:/usr/bin/ld: )?cannot find -l(.*?)$} ) {
+	if (
+		m{^(?:/usr/bin/ld: )?cannot find -l(.*?)$}
+	) {
 		my $lib = $1;
 		warn "Looking for library $lib\n";
 		poldek_file( "/usr/lib64/lib$lib.so", "/usr/lib/lib$lib.so",
 			"/usr/lib*/lib$lib.so" );
 	}
-	if ( m{^error: Couldn't exec (/\S+): No such file or directory$} 
+
+	# full path to ldd files
+	if (
+		m{^WARNING; can.*t resolve .* dependency: (.*?)$}
+	) {
+		my $lib = $1;
+		warn "Looking for library '$lib'\n";
+		poldek_file( "/usr/lib64/$lib", "/usr/lib/$lib", "/lib64/$lib", "/lib/$lib");
+	}
+
+	if ( m{^error: Couldn't exec (/\S+): No such file or directory$}
 			or m{^Can't open perl script "(/\S+)": No such file or directory$}
 			or m{unable to open (/\S+) \(No such file or directory\)$}
 			or m{GConf-CRITICAL \*\*: No such file `(/.\S+?)'$}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/cleanbuild.git/commitdiff/738a052436e81a60bb4cbdd1af2ea9dd1a460f4c



More information about the pld-cvs-commit mailing list