[Libreoffice-commits] core.git: Repository.mk solenv/bin

[Stephan Bergmann]

 Repository.mk                           |    2 +-
 solenv/bin/modules/installer/epmfile.pm |   12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

New commits:
commit c3e55a1f3b88fd53d13f563a4116d588643c34d7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Nov 8 12:32:55 2013 +0100

    Hard-code the path to libgetuid.so in epmfile.pm
    
    ...so that it is still found after 7b3133ad882b24834f87b478d00bf4ee92d3cd63
    "instsetoo_native: shouldn't need instdir in include path."  And no idea why
    getuid was in PLAINLIBS_URE instead of PLAINLIBS_NONE.
    
    Change-Id: I5de2a79cbd3c0064cd7776e269f4792304ec34e3

diff --git a/Repository.mk b/Repository.mk
index 9b688ac..ac07ba1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -439,6 +439,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 endif
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
+	getuid \
 	smoketest \
 	subsequenttest \
 	test \
@@ -496,7 +497,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
 ))
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 	$(if $(filter MSC,$(COM)),cli_uno) \
-	getuid \
 	jpipe \
 	$(if $(filter WNT,$(OS)),jpipx) \
 ))
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index c386465..c81ac99 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -794,16 +794,8 @@ sub set_patch_state
 
 sub get_ld_preload_string
 {
-    my ($includepatharrayref) = @_;
-
-    my $getuidlibraryname = "libgetuid.so";
-
-    my $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0);
-    if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_ld_preload_string"); }
-
-    my $ldpreloadstring = "LD_PRELOAD=" . $$getuidlibraryref;
-
-    return $ldpreloadstring;
+    return 'LD_PRELOAD=' . $ENV{'WORKDIR'}
+        . '/CustomTarget/setup_native/libgetuid.so';
 }
 
 #################################################