diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2013-12-10 21:44:07 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2013-12-10 22:26:05 +0100 |
| commit | 203e84d434de904add0b4426e87a4eb0a9a50c66 (patch) | |
| tree | e48e09d5869908ba0971386fd7dda7f9a1a09386 | |
| parent | 3fc6fc2ff7304a0d1bc85bd2e03fb3fbab492c9a (diff) | |
installer: Fix path to libgetuid.so again. Hardcode it.
Hopefully fixes fdo#67388. I can't reproduce here.
Change-Id: I5bcbb59a0f49e925d60f225b0f8f925d6d5dc468
| -rw-r--r-- | solenv/bin/modules/installer/download.pm | 19 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/epmfile.pm | 2 |
2 files changed, 3 insertions, 18 deletions
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index b678bbf46ece..d1e74bd93294 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -192,22 +192,7 @@ sub call_sum sub get_path_for_library { - my ($includepatharrayref) = @_; - - my $getuidlibraryname = "libgetuid.so"; - - my $getuidlibraryref = ""; - - if ( $installer::globals::include_paths_read ) - { - $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0); - } - else - { - $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$getuidlibraryname, $includepatharrayref, 0); - } - - return $$getuidlibraryref; + return $ENV{'WORKDIR'} . '/LinkTarget/Library/libgetuid.so'; } ######################################################### @@ -738,7 +723,7 @@ sub create_download_sets # getting the path of the getuid.so (only required for Solaris and Linux) my $getuidlibrary = ""; - if (( $installer::globals::issolarisbuild ) || ( $installer::globals::islinuxbuild )) { $getuidlibrary = get_path_for_library($includepatharrayref); } + if (( $installer::globals::issolarisbuild ) || ( $installer::globals::islinuxbuild )) { $getuidlibrary = get_path_for_library(); } if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) { diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index c81ac9910e1a..dca6eeacb563 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -795,7 +795,7 @@ sub set_patch_state sub get_ld_preload_string { return 'LD_PRELOAD=' . $ENV{'WORKDIR'} - . '/CustomTarget/setup_native/libgetuid.so'; + . '/LinkTarget/Library/libgetuid.so'; } ################################################# |