[Libreoffice-commits] .: solenv/bin

[Michael Meeks]

 solenv/bin/linkoo |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 4069ef4c8db6207169d164768abada7c38b8dd84
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Jun 21 15:43:28 2011 +0100

    fix bug with duplicate entry in hash trampling on dll linking

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 2113c76..a1a469a 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -74,20 +74,19 @@ $program_dir = 'openoffice.org/basis-link/MacOS' if ($ENV{OS} eq 'MACOSX'); # FI
 
 my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
 
+my $dllre = '\.so$';
+$dllre = '\.dylib$' if ($ENV{OS} eq 'MACOSX');
+
 my %replaceable = (
-    $program_dir => '\.so',
+    $program_dir => "($dllre|\.rdb)",
+    $ure_lib_dir => "$dllre",
     $program_dir . '/resource' => '\.res$',
     $program_dir . '/classes' => '\.jar$',
     'basis-link/share/config' => '\.zip$',
-    $program_dir => '\.rdb',
     'ure/share/misc' => '\.rdb'
 #    'share/uno_packages' => '\.zip$'
 );
 
-# strangely enough, OSX has those small differences...
-$replaceable{$program_dir} = '\.dylib$' if ($ENV{OS} eq 'MACOSX');
-$replaceable{$ure_lib_dir} = '\.dylib$' if ($ENV{OS} eq 'MACOSX');
-
 my @search_dirs = ( 'lib', 'bin', 'class' );
 
 my @known_duplicates = ( 'db.jar', 'libi18n' );