[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - setup_native/Library_getuid.mk solenv/bin

[Petr Mladek]

 setup_native/Library_getuid.mk           |    8 ++++++++
 solenv/bin/modules/installer/download.pm |    2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 1a97f10084629df98606746da6401fdff3996914
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Aug 2 16:24:23 2013 +0200

    let's own the packaged stuff by root:root again (fdo#67388)
    
    We have started to use -fvisibility=hidden globally with GCC.
    The hacky libgetuid.so does not work if the symbols are hidden.
    
    In addition, the library was renamed from getuid.so to libgetuid.so
    during gbuildisation; There was more location where it was not fixed;
    The result was that the packages and files in the Linux download tarballs
    were owned by some "ugly" user and group.
    
    Change-Id: I22f62b861c373f2553dcccc85a84dddabaf1f418
    Reviewed-on: https://gerrit.libreoffice.org/5251
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/setup_native/Library_getuid.mk b/setup_native/Library_getuid.mk
index 764128d..fa98773 100644
--- a/setup_native/Library_getuid.mk
+++ b/setup_native/Library_getuid.mk
@@ -14,6 +14,14 @@ $(eval $(call gb_Library_add_defs,getuid,\
     -D_GNU_SOURCE \
 ))
 endif
+
+# the library is used by LD_PRELOAD; make sure that we see the symbols ;-)
+ifeq ($(COM),GCC)
+$(eval $(call gb_Library_add_cflags,getuid,\
+    -fvisibility=default \
+))
+endif
+
 $(eval $(call gb_Library_add_cobjects,getuid,\
     setup_native/scripts/source/getuid \
 ))
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 9c4dde6..ec54049 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -194,7 +194,7 @@ sub get_path_for_library
 {
     my ($includepatharrayref) = @_;
 
-    my $getuidlibraryname = "getuid.so";
+    my $getuidlibraryname = "libgetuid.so";
 
     my $getuidlibraryref = "";