[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - rsc/Executable_rscpp.mk solenv/gbuild

[Libreoffice Gerrit user]

 rsc/Executable_rscpp.mk     |    4 ++++
 solenv/gbuild/LinkTarget.mk |    3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 2717421af58a66b3f2c75c22dde5884bb6ad6b89
Author:     Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sat Sep 8 08:16:23 2018 +0000
Commit:     Damjan Jovanovic <damjan at apache.org>
CommitDate: Sat Sep 8 08:16:23 2018 +0000

    When building other languages (--with-lang="..."), the build was breaking
    
    because rsc couldn't compile certain resources (usually in main/sfx2).
    
    Apparently the RSC preprocessor, rscpp, uses very small buffers by default.
    When the SOLAR preprocessor definition is defined, it uses bigger buffers
    instead. Previously dmake was explicitly passing "-DSOLAR" to the C compiler
    but I missed it when porting main/rsc to gbuild. When added back,
    main/sfx2 builds languages successfully.
    
    Patch by: me

diff --git a/rsc/Executable_rscpp.mk b/rsc/Executable_rscpp.mk
index e55f1012bda0..4011a52e2fbf 100644
--- a/rsc/Executable_rscpp.mk
+++ b/rsc/Executable_rscpp.mk
@@ -31,6 +31,10 @@ $(eval $(call gb_Executable_set_include,rscpp,\
         -I$(SRCDIR)/rsc/inc/pch \
 ))
 
+$(eval $(call gb_Executable_add_defs,rscpp,\
+	-DSOLAR \
+))
+
 ifeq ($(GUI),UNX)
 $(eval $(call gb_Executable_add_defs,rscpp,\
 	-Dunix \
commit f57b17ed4cbe46f05c6c53db73f68ef49d160733
Author:     Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sat Sep 8 08:13:10 2018 +0000
Commit:     Damjan Jovanovic <damjan at apache.org>
CommitDate: Sat Sep 8 08:13:10 2018 +0000

    Strip carriage returns from the Bison source files.
    
    This hasn't been necessary so far, but dmake did it, so let's be safe.
    
    Patch by: me

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 78c3f7f021c6..62871966edfb 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -617,7 +617,8 @@ endif
 
 $(call gb_BisonTarget_get_target,$(1),$(2)) : $(call gb_BisonTarget_get_source,$(2))
 	mkdir -p $(dir $(call gb_BisonTarget_get_target,$(1),$(2))) && \
-	bison -d -o $(call gb_BisonTarget_get_target,$(1),$(2)) $(call gb_BisonTarget_get_source,$(2)) 
+	tr -d "\015" < $(call gb_BisonTarget_get_source,$(2)) > $(dir $(call gb_BisonTarget_get_target,$(1),$(2)))/stripped_$(notdir $(call gb_BisonTarget_get_source,$(2))) && \
+	bison -d -o $(call gb_BisonTarget_get_target,$(1),$(2)) $(dir $(call gb_BisonTarget_get_target,$(1),$(2)))/stripped_$(notdir $(call gb_BisonTarget_get_source,$(2)))
 
 endef