Re: [GERRIT][PATCH] gbuild conversion l10ntools module

Hi Christian,

if this patch fixes your build, fill free to push it.

Ciao
David

On 06.05.2012 16:42, Christian Lohmaier wrote:
> Hi David, *,
>
> On Sun, May 6, 2012 at 4:21 PM, David Ostrovsky<david.ostrovsky@gmx.de>  wrote:
> > On 06.05.2012 14:29, Christian Lohmaier wrote:
> > > On Thu, May 3, 2012 at 1:23 PM, Thorsten Behrens
> > Could you please try make verbose=t on master and send us results?
> > I saw on your tinderbox, that there are obviously some problems with
> > recently introduced add_scanner(s)
> Current tinderbox error is because flex on XCode 2.5.x doesn't support
> space between -o and the output filename.
> --- a/solenv/gbuild/LinkTarget.mk
> +++ b/solenv/gbuild/LinkTarget.mk
> @@ -268,7 +268,7 @@ define gb_LexTarget__command
>   $(call gb_Output_announce,$(2),$(true),LEX,3)
>   $(call gb_Helper_abbreviate_dirs,\
>          mkdir -p $(dir $(3))&&  \
> -       $(FLEX) $(T_LEXFLAGS) -o $(4) $(1)&&  touch $(3) )
> +       $(FLEX) $(T_LEXFLAGS) -o$(4) $(1)&&  touch $(3) )
>   endef
>
>   fixes it for me, but maybe then breaks more current versions of flex.
>
> > methods (idlc&  l10ntools modules), because .cxx files are not generated
> > from .l.
> > But i can not see why.
> But with the above fixed flex runs fine but then the build breaks with:
>
>
> $ make verbose=t
> [ build CXX ] LexTarget/l10ntools/source/cfglex.cxx
> test -f 
> /Users/buildslave/compile.noindex/libreoffice/workdir/unxmacxp.pro/LexTarget/l10ntools/source/cfglex.cxx
> || (echo "Missing generated source file
> /Users/buildslave/compile.noindex/libreoffice/workdir/unxmacxp.pro/LexTarget/l10ntools/source/cfglex.cxx"
> &&  false)
> S=/Users/buildslave/compile.noindex/libreoffice&&
> O=$S/solver/unxmacxp.pro&&  W=$S/workdir/unxmacxp.pro&&    mkdir -p
> $W/GenCxxObject/LexTarget/l10ntools/source/
> $W/Dep/GenCxxObject/LexTarget/l10ntools/source/&&  g++ -DCPPU_ENV=gcc3
> -DGCC -DGXX_INCLUDE_PATH=/usr/include/c++/4.0.0
> -DHAVE_GCC_VISIBILITY_FEATURE -DHAVE_SFINAE_ANONYMOUS_BROKEN -DMACOSX
> -DMAC_OS_X_VERSION_MAX_ALLOWED=1040
> -DMAC_OS_X_VERSION_MIN_REQUIRED=1040 -DNDEBUG -DNO_PTHREAD_PRIORITY
> -DOPTIMIZE -DOSL_DEBUG_LEVEL=0 -DPOWERPC -DPPC -DQUARTZ -DSOLAR_JAVA
> -DSUPD=360 -DUNIX -DUNX -D_PTHREADS -D_REENTRANT   -Werror
> -DLIBO_WERROR -isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wall
> -Wendif-labels -Wextra -fmessage-length=0 -fno-common -pipe  -fPIC
> -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-strict-aliasing
> -fsigned-char -malign-natural  -Wno-long-double
> -fno-threadsafe-statics  -DEXCEPTIONS_ON -fexceptions
> -fno-enforce-eh-specs -O2   -Wno-error -c
> $W/LexTarget/l10ntools/source/cfglex.cxx -o
> $W/GenCxxObject/LexTarget/l10ntools/source/cfglex.o -MMD -MT
> $W/GenCxxObject/LexTarget/l10ntools/source/cfglex.o -MP -MF
> $W/Dep/GenCxxObject/LexTarget/l10ntools/source/cfglex.d_
> -I$W/LexTarget/l10ntools/source/  -I$S/l10ntools/inc -I$O/inc/external
> -I$O/inc -I$S/solenv/inc
> -I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers
> -I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/JavaVM/Headers
>   &&  mv $W/Dep/GenCxxObject/LexTarget/l10ntools/source/cfglex.d_
> $W/Dep/GenCxxObject/LexTarget/l10ntools/source/cfglex.d
> /Users/buildslave/compile.noindex/libreoffice/l10ntools/source/cfglex.l:
> In function 'void YYWarning(const char*)':
> /Users/buildslave/compile.noindex/libreoffice/l10ntools/source/cfglex.l:143:
> error: 'yylineno' was not declared in this scope
> /Users/buildslave/compile.noindex/libreoffice/l10ntools/source/cfglex.l:
> In function 'void yyerror(const char*)':
> /Users/buildslave/compile.noindex/libreoffice/l10ntools/source/cfglex.l:152:
> error: 'yylineno' was not declared in this scope
> /Users/buildslave/compile.noindex/libreoffice/workdir/unxmacxp.pro/LexTarget/l10ntools/source/cfglex.cxx:
> At global scope:
> /Users/buildslave/compile.noindex/libreoffice/workdir/unxmacxp.pro/LexTarget/l10ntools/source/cfglex.cxx:2862:
> warning: 'void yyunput(int, char*)' defined but not used
> make: *** 
> [/Users/buildslave/compile.noindex/libreoffice/workdir/unxmacxp.pro/GenCxxObject/LexTarget/l10ntools/source/cfglex.o]
> Error 1
>
> Didn't find time to look into that yet - so if that's enough info for
> you to fix it, I'd be more than happy :-)
>
> ciao
> Christian

From 85760281406b7803c2e2f793a08b0000b660887b Mon Sep 17 00:00:00 2001
From: David Ostrovsky <David.Ostrovsky@gmx.de>
Date: Sun, 6 May 2012 17:21:18 +0200
Subject: [PATCH] fix subtle flex problems on MacOS

Change-Id: Id3d8313eabcef926b3ab3c121597f7b8cb5e0124
---
 l10ntools/source/cfglex.l   |    1 +
 l10ntools/source/srclex.l   |    1 +
 l10ntools/source/xrmlex.l   |    1 +
 solenv/gbuild/LinkTarget.mk |    2 +-
 4 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l
index e7d6b40..dda0246 100644
--- a/l10ntools/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -45,6 +45,7 @@ extern "C" FILE * init(int, char **);
 int bText=0;
 %}
 
+%option yylineno
 %option never-interactive
 
 %p 24000
diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l
index 38eb105..6001725 100644
--- a/l10ntools/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -47,6 +47,7 @@ extern "C" void Close();
 void YYWarning();
 %}
 
+%option yylineno
 %option never-interactive
 
 %p 24000
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index 500c1b9..5e00cc1 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -53,6 +53,7 @@ void YYWarning();
 int bText=0;
 %}
 
+%option yylineno
 %option never-interactive
 
 %p 24000
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 0fb8aef..c412d57 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -268,7 +268,7 @@ define gb_LexTarget__command
 $(call gb_Output_announce,$(2),$(true),LEX,3)
 $(call gb_Helper_abbreviate_dirs,\
        mkdir -p $(dir $(3)) && \
-       $(FLEX) $(T_LEXFLAGS) -o $(4) $(1) && touch $(3) )
+       $(FLEX) $(T_LEXFLAGS) -o$(4) $(1) && touch $(3) )
 endef
 
 
-- 
1.7.5.4