merge commit to DEV300_m57

2 files changed, 11 insertions, 2 deletions

diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
index 8d048e3b13dc..8ffbabcbbfaf 100755
--- a/postprocess/rebase/coffbase.txt
+++ b/postprocess/rebase/coffbase.txt
@@ -161,7 +161,7 @@ jvmfwk3.dll      0x0000000062330000 0x00020000
 ldapbe2.uno.dll  0x0000000062300000 0x00020000

 legacy_binfiltersmi.dll 0x00000000622d0000 0x00020000

 libcurl.dll      0x0000000062290000 0x00030000

-libdb42.dll      0x00000000621f0000 0x00090000

+libdb47.dll      0x00000000621f0000 0x00090000

 libeay32.dll     0x00000000620d0000 0x00110000

 libexslt.dll     0x00000000620a0000 0x00020000

 librdf.dll       0x0000000062070000 0x00020000

diff --git a/postprocess/rebase/rebase.pl b/postprocess/rebase/rebase.pl
index 6e4afc58428d..8afe774a8f5e 100755
--- a/postprocess/rebase/rebase.pl
+++ b/postprocess/rebase/rebase.pl
@@ -179,6 +179,7 @@ sub get_files
     foreach my $pattern ( @target ) {
         foreach my $i ( glob( $pattern ) ) {
             my $lib = File::Basename::basename $i;
+        $lib =~ s/\+/\\\+/g;
             if ( grep /^$lib$/i, (keys %lastrun) ) {
                 push @$oldfiles_ref, $i;
             } else {
@@ -196,6 +197,7 @@ sub rebase_again
     my $oldfiles_ref = shift;
     my $newfiles_ref = shift;
     my @grownfiles;
+    my $solarbin ="$ENV{SOLARVERSION}/$ENV{INPATH}/bin$ENV{UPDMINOREXT}";
     my $command = "rebase " . $options_string;
     if ( $ENV{WRAPCMD} ) {
         $command = $ENV{WRAPCMD} . " " . $command;
@@ -222,7 +224,14 @@ sub rebase_again
         print;
         # evaluate error messages
         if ( /REBASE: ([^\s]+).*Grew too large/ ) {
-            push @grownfiles, $1;
+            my $toobig_name = $1;
+            if ( -e "$solarbin/so/$toobig_name" ) {
+                push @grownfiles, "$solarbin/so/$toobig_name";
+                print "name was : $toobig_name\n";
+                print "push $solarbin/so/$toobig_name\n";
+            } else {
+                push @grownfiles, "$solarbin/$toobig_name";
+            }
         }
     }
     close( COMMAND );