[Libreoffice-commits] core.git: 2 commits - filter/CustomTarget_svg.mk sdext/CustomTarget_pdfimport.mk

[Miklos Vajna]

 filter/CustomTarget_svg.mk      |    2 +-
 sdext/CustomTarget_pdfimport.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0f9a75a2c5cadc23a853f919bed8faccd2baf004
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Apr 14 14:10:19 2014 +0200

    sdext: use --switch=2 --readonly-tables gperf options
    
    See 73ecb924379b8e665ee94235a353403c5d29eae6 (Use --switch=2
    --readonly-tables gperf options, 2014-04-13) for reasoning.
    
    Change-Id: Ie1cfe753979d908077134b86587d8de5fa7c2ee8

diff --git a/sdext/CustomTarget_pdfimport.mk b/sdext/CustomTarget_pdfimport.mk
index eccb8d0..ab313dc 100644
--- a/sdext/CustomTarget_pdfimport.mk
+++ b/sdext/CustomTarget_pdfimport.mk
@@ -16,6 +16,6 @@ $(call gb_CustomTarget_get_workdir,sdext/pdfimport)/hash.cxx : \
 		$(SRCDIR)/sdext/source/pdfimport/wrapper/keyword_list \
 		| $(call gb_CustomTarget_get_workdir,sdext/pdfimport)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GPF,1)
-	$(GPERF) -C -t -l -L C++ -m 20 -Z PdfKeywordHash -k'4-5,$$' $< > $@
+	$(GPERF) -C -t -l -L C++ -m 20 --switch=2 --readonly-tables -Z PdfKeywordHash -k'4-5,$$' $< > $@
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
commit bcccd851765b635a9ed4a33eb47d0e9663106035
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Apr 14 14:03:52 2014 +0200

    filter: use --switch=2 --readonly-tables gperf options
    
    See 73ecb924379b8e665ee94235a353403c5d29eae6 (Use --switch=2
    --readonly-tables gperf options, 2014-04-13) for reasoning.
    
    Change-Id: Ic63747a6cd982557cad8470ae775afa4b3d8d883

diff --git a/filter/CustomTarget_svg.mk b/filter/CustomTarget_svg.mk
index 46b802d..2904da9 100644
--- a/filter/CustomTarget_svg.mk
+++ b/filter/CustomTarget_svg.mk
@@ -37,7 +37,7 @@ $(filter_GEN_svg_Tokens_hxx) : $(filter_GEN_svg_Tokens_gperf)
 $(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GPF,1)
 	$(call gb_Helper_abbreviate_dirs, \
-		 $(GPERF) --compare-strncmp -C -m 20  $(filter_GEN_svg_Tokens_gperf) \
+		 $(GPERF) --compare-strncmp -C -m 20 --switch=2 --readonly-tables $(filter_GEN_svg_Tokens_gperf) \
 			 | sed -e "s/(char\*)0/(char\*)0$(COMMA) 0/g" \
 			 > $(filter_GEN_svg_Tokens_cxx))