[openoffice] branch AOO42X updated: Save getuid only for Solaris (do we even support that anymre)?

[jim]

This is an automated email from the ASF dual-hosted git repository.

jim pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO42X by this push:
     new d45d6f4  Save getuid only for Solaris (do we even support that anymre)?
d45d6f4 is described below

commit d45d6f460c54bf1c83c0fd28a669498f82419a21
Author: Jim Jagielski <jim...@gmail.com>
AuthorDate: Mon Jan 4 07:46:24 2021 -0500

    Save getuid only for Solaris (do we even support that anymre)?
    
    (cherry picked from commit d921515fcc11f846c699c95d0d3d2e52dd7a4ea3)
---
 main/solenv/bin/modules/installer/simplepackage.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/main/solenv/bin/modules/installer/simplepackage.pm 
b/main/solenv/bin/modules/installer/simplepackage.pm
index 89ca043..6bbcdde 100644
--- a/main/solenv/bin/modules/installer/simplepackage.pm
+++ b/main/solenv/bin/modules/installer/simplepackage.pm
@@ -549,14 +549,18 @@ sub create_package
        }
        else
        {
-               # getting the path of the getuid.so (only required for Solaris 
and Linux)
+               # getting the path of the getuid.so (Solaris) or fakeroot 
(Linux)
                my $getuidlibrary = "";
                my $ldpreloadstring = "";
-               if (( $installer::globals::issolarisbuild ) || ( 
$installer::globals::islinuxbuild ))
+               if ( $installer::globals::issolarisbuild )
                {
                        $getuidlibrary = 
installer::download::get_path_for_library($includepatharrayref);
                        if ( $getuidlibrary ne "" ) { $ldpreloadstring = 
"LD_PRELOAD=" . $getuidlibrary; }
                }
+               elsif ( $installer::globals::islinuxbuild )
+               {
+                       $ldpreloadstring = $ENV{'FAKEROOT'};
+               }
 
                $systemcall = "cd $tempdir; $ldpreloadstring tar -cf - . | gzip 
> $archive";
        }