Re: [Libreoffice] A couple of problem in build (LibreOfficeLinux)

The attached patch seems better then the one before.

Please have a look.

beppec56

Giuseppe Castagno wrote:
> Hi all,
>
> I stumbled on a couple of error while building with a recent git pull -r 
> from repo (this morning, around 8 CET).
>
> System: Ubuntu 9.10
>
> autogen command:
> ./autogen.sh --with-distro=LibreOfficeLinux  --with-gcc-speedup=ccache 
> --with-git --with-num-cpus=2 --with-lang='en-US it' --enable-kde=no 
> --enable-kde4=yes
>
> build log with error:
>
> ....
> Revert font mapping munging ...
> test -n "" && /home/beppe/LibO-b/LibO_master-head/build/bin/gob 
> --build-dir=/home/beppe/LibO-b/LibO_master-head/build/build/libreoffice-3.2.99.2 
> prepare || true
> FLAGS=`/home/beppe/LibO-b/LibO_master-head/build/bin/applyflags 
> /home/beppe/LibO-b/LibO_master-head/build/bin` ; \
>     CURSOURCE=libreoffice-3.2.99.2; test -f 
> /home/beppe/LibO-b/LibO_master-head/build/build/libreoffice-3.2.99.2/.source 
> && CURSOURCE=`cat 
> /home/beppe/LibO-b/LibO_master-head/build/build/libreoffice-3.2.99.2/.source`; 
> \
>     chmod +x /home/beppe/LibO-b/LibO_master-head/build/patches/apply.pl 
> && /home/beppe/LibO-b/LibO_master-head/build/patches/apply.pl 
> /home/beppe/LibO-b/LibO_master-head/build/patches/dev300 
> /home/beppe/LibO-b/LibO_master-head/build/build/libreoffice-3.2.99.2 
> $FLAGS --tag=$CURSOURCE ;
> test: 13: z/home/beppe/LibO-b/LibO_master-head/build/bin: unexpected 
> operator
> /home/beppe/LibO-b/LibO_master-head/build/bin/applyflags: 16: Syntax 
> error: Bad fd number
> Execute with  for distro(s) 'Debian'
> PATCHPATH => 
> .:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting:../lwp 
>
> OLDEST_SUPPORTED => ooo330-m7 ooo-build-3.2.98.0 libreoffice-3.2.99.1
> ....
>
> the source ended up with the patch set for Debian applied, so even 
> though if was all right straight to smoketest, the splash at LibO start 
> has the bitmap missing while the bar is in place.
> Another error was the missed Italian localized full package, while the 
> Italian packlanguage was present.
>
> The attached patch solves the second error 
> (/home/beppe/LibO-b/LibO_master-head/build/bin/applyflags: 16: Syntax 
> error: Bad fd number) but the first error seems embedded in a python 
> script; a language I don't know very well.
> All this seems related to the /bin/bash =-> /bin/sh change.
>
> Don't know if it's needed, anyway patch is supplied compliant to LGPLv3+ 
> license.
>
> beppec56.
>
>
> ------------------------------------------------------------------------
>
> _______________________________________________
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice


--
Kind Regards,
Giuseppe Castagno
Acca Esse http://www.acca-esse.eu
giuseppe.castagno at acca-esse.eu
beppec56 at openoffice.org

diff --git a/bin/applyflags b/bin/applyflags
index 531c89a..afd3bfe 100755
--- a/bin/applyflags
+++ b/bin/applyflags
@@ -7,13 +7,13 @@ bindir=$1
 # optional to force another OOBUILDDIR in the split build
 builddir=$2
 
-if test "z$bindir" == "z"; then
+if test "z$bindir" = "z"; then
     echo "Serious error - requires path to bindir"
     exit 1
 fi
 
 cd $bindir
-source ./setup >& /dev/null
+. ./setup 2>&1 /dev/null
 
 SECTIONS="$OOO_ADDITIONAL_SECTIONS"