Re: [Libreoffice] [REVIEW] new build breaker in configure/set_soenv

Andreas Radke píše v Út 21. 06. 2011 v 20:23 +0200:
> New build breaker here in ArchLinux: my i686 build in a chroot breaks
> while native pkg build x86_64 went fine:
>
> setting up the build environment variables...
> checking solver path... default
> setting up the post_download check script
> configure: creating ./config.status
> config.status: creating ooo.lst
> config.status: creating set_soenv
> config.status: creating Makefile
> config.status: creating bin/repo-list
> Setting up the environment for building LibreOffice 
> Setting Linux x86 specific values... done
> readdir() attempted on invalid dirhandle DIR at ./set_soenv line 1072.
> closedir() attempted on invalid dirhandle DIR at ./set_soenv line 1073.

The check fails if the optional translation sources are missing.

Does the attached patch help you?
Could anyone approve it for the libreoffice-3-4 branch?

Note that I took the change from master, from
http://cgit.freedesktop.org/libreoffice/bootstrap/commit/?id=7670a1756a42025d8f3dd6ecf4a64194bcc20757


Best Regards,
Petr

From 900baff9ff400a6eba034089ed69362c2c2d61e4 Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Wed, 22 Jun 2011 12:05:19 +0200
Subject: [PATCH] fix configure without the optional translations module

---
 set_soenv.in |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/set_soenv.in b/set_soenv.in
index f015bab..8e39314 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1068,9 +1068,11 @@ $XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$wps.'.';
 $L10N_MODULE = PathFormat($SRC_ROOT."/translations");
 
 # Check for poor help localizations, i.e. no help translation at all...
-opendir(DIR,$L10N_MODULE . "/source");
-@languages = readdir(DIR);
-closedir(DIR);
+@languages=();
+if (opendir(DIR,$L10N_MODULE . "/source"))
+{  @languages = readdir(DIR);
+   closedir(DIR);
+}
 $WITH_POOR_HELP_LOCALIZATIONS = "";
 
 foreach $language (@languages)
-- 
1.7.3.4