mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hard-code the path to libgetuid.so in epmfile.pm

Browse Source 
...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
This commit is contained in:
Stephan Bergmann 2013-11-08 12:32:55 +01:00
parent e8176a5d48
commit c3e55a1f3b
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Repository.mk
View File

@ -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) \
))

12
solenv/bin/modules/installer/epmfile.pm
View File

@ -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';
}
#################################################