Author: sparky
Date: Tue Dec  8 18:33:35 2009
New Revision: 11022

Modified:
   toys/tools/cleanbuild/findbr
Log:
- check config.log


Modified: toys/tools/cleanbuild/findbr
==============================================================================
--- toys/tools/cleanbuild/findbr        (original)
+++ toys/tools/cleanbuild/findbr        Tue Dec  8 18:33:35 2009
@@ -26,11 +26,17 @@
        "zlib-devel" => +1,
        "libstdc++-devel" => +1,
        "libusb-compat-devel" => +1,
+       "libjpeg-devel" => +1,
+       "libsamplerate-devel" => +1,
+       "pulseaudio-devel" => +1,
+       "xorg-lib-libXrandr-devel" => +1,
 );
 
 # translate package name to privodes name
 my %translate = (
        "rarian-compat" => "scrollkeeper",
+       "Mesa-libGL" => "OpenGL",
+       "Mesa-libGL-devel" => "OpenGL-devel",
        "Mesa-libGLU-devel" => "OpenGL-GLU-devel",
 );
 
@@ -192,6 +198,10 @@
        return undef;
 }
 
+my $check_config_log = undef;
+
+start_check:
+
 my %checked;
 my $cmake_get_call = 0;
 my $cmake_pkg_list = 0;
@@ -315,6 +325,9 @@
                warn "Need to check configure source: $reason\n";
                $check_ac = 1;
        }
+       if ( m{^configure: error:} ) {
+               $check_config_log = 1 unless defined $check_config_log;
+       }
 
        if ( m{^CMake Error at (?:\S+/)?(\S+?)\.cmake:(\d+) } ) {
                my ( $module, $line ) = ( lc $1, $2 );
@@ -428,6 +441,23 @@
        find( \&wanted, $builddir );
 }
 
+sub wanted2
+{
+       return unless /^config\.log$/;
+       return unless -r;
+
+       warn "$File::Find::name\n";
+       open F_IN, "<", $_;
+       push @lines, <F_IN>;
+       close F_IN;
+}
+
+if ( $check_config_log ) {
+       $check_config_log = 0;
+       find( \&wanted2, $builddir );
+       goto start_check if @lines;
+}
+
 foreach my $pkg ( sort keys %out ) {
        print "$pkg -- $out{$pkg}\n";
 }
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to