setup_native/Package_scripts_generated.mk | 1 - solenv/bin/modules/installer/epmfile.pm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
New commits: commit ece304a932ddd8e5cf9e1d8a5f8fd6810c011657 Author: Thorsten Behrens <[email protected]> Date: Sat Feb 16 02:20:29 2013 +0100 Fix build for --enable-epm / --with-package-format=deb rpm case. This was somewhat broken after the setup_native gbuild conversion. Change-Id: I825dd5008348534718a5b43e6a3eb893fa75135b diff --git a/setup_native/Package_scripts_generated.mk b/setup_native/Package_scripts_generated.mk index 898b4cb..958eff2 100644 --- a/setup_native/Package_scripts_generated.mk +++ b/setup_native/Package_scripts_generated.mk @@ -20,7 +20,6 @@ ifeq ($(OS),LINUX) ifneq ($(filter rpm,$(PKGFORMAT)),) $(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/install,install)) $(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/uninstall,uninstall)) -$(eval $(call gb_Package_add_file,scripts_generated,bin/openoffice-userland-1.0-0.noarch.rpm,noarch/fake-db-1.0-0.noarch.rpm)) endif endif # vim: set noet sw=4 ts=4: diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index 58fe27d..72420d4 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -784,7 +784,7 @@ sub get_ld_preload_string { my ($includepatharrayref) = @_; - my $getuidlibraryname = "getuid.so"; + 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"); } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
