[Libreoffice-commits] .: solenv/bin

Jan Holesovsky kendy at kemper.freedesktop.org
Tue Jul 24 05:12:31 PDT 2012


 solenv/bin/modules/installer/windows/msiglobal.pm |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 8251cd1936af5047c817adf88333fef31031c506
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Jul 24 14:10:41 2012 +0200

    Call uuidgen without -n when cross-compiling.
    
    Change-Id: I533c9bcdbadcaf5caa5aa8bcefb6dc0c141a4d0e

diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index d4b626d..93cc78c 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1272,6 +1272,11 @@ sub get_guid_list
     # "-c" for uppercase output
 
     my $systemcall = "$uuidgen -n$number |";
+    if ( $ENV{'CROSS_COMPILING'} eq 'YES' )
+    {
+        # -n is not present in the non-windows uuidgen
+        $systemcall = "for I in `seq 1 $number` ; do uuidgen ; done |";
+    }
     open (UUIDGEN, "$systemcall" ) or die("uuidgen is missing.");
     my @uuidlist = <UUIDGEN>;
     close (UUIDGEN);


More information about the Libreoffice-commits mailing list