From 934da4d8f8a6a9099d59fbf072b6dc37d4368ad5 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 21 Jun 2011 15:43:28 +0100 Subject: fix bug with duplicate entry in hash trampling on dll linking --- solenv/bin/linkoo | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'solenv/bin') diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index 2113c76ae9e9..a1a469ae9d58 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' ); -- cgit