editeng/CustomTarget_generated.mk | 4 ++--
sw/CustomTarget_generated.mk | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit f876fdd1c0ca11dc81832e05b7203987c0c80558
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 17 10:28:08 2019 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 17 13:20:24 2019 +0100
Check OS_FOR_BUILD for behavior of sed executed during build
Follow-up to d8106b6db488a4439f7bb781920c92a056b91ba6 "Non-standard sed -i
option is different on macOS than with GNU sed", thanks to mst for spotting
it.
Change-Id: Ida51cfa7c4dd216a5164df4f8143ac89cf2c6b7f
Reviewed-on: https://gerrit.libreoffice.org/66498
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/editeng/CustomTarget_generated.mk
b/editeng/CustomTarget_generated.mk
index 91d6aa46bc65..c47dda3ecc57 100644
--- a/editeng/CustomTarget_generated.mk
+++ b/editeng/CustomTarget_generated.mk
@@ -19,8 +19,8 @@ $(editeng_INC)/tokens.hxx $(editeng_INC)/tokens.gperf :
$(editeng_SRC)/tokens.tx
$(editeng_INC)/tokens.cxx : $(editeng_INC)/tokens.gperf
$(GPERF) --compare-strncmp --readonly-tables
--output-file=$(editeng_INC)/tokens.cxx $(editeng_INC)/tokens.gperf
- sed -i $(if $(filter MACOSX,$(OS)),'') -e "s/(char\*)0/(char\*)0,
XML_TOKEN_INVALID/g" $(editeng_INC)/tokens.cxx
- sed -i $(if $(filter MACOSX,$(OS)),'') -e "/^#line/d"
$(editeng_INC)/tokens.cxx
+ sed -i $(if $(filter MACOSX,$(OS_FOR_BUILD)),'') -e
"s/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g" $(editeng_INC)/tokens.cxx
+ sed -i $(if $(filter MACOSX,$(OS_FOR_BUILD)),'') -e "/^#line/d"
$(editeng_INC)/tokens.cxx
$(call gb_CustomTarget_get_target,editeng/generated) :
$(editeng_INC)/tokens.cxx
diff --git a/sw/CustomTarget_generated.mk b/sw/CustomTarget_generated.mk
index 94ffb5e1aaa0..e3c266b52665 100644
--- a/sw/CustomTarget_generated.mk
+++ b/sw/CustomTarget_generated.mk
@@ -26,8 +26,8 @@ $(sw_INC)/tokens.cxx : $(sw_INC)/TextBlockTokens.gperf
$(sw_INC)/BlockListTokens
--class-name=TextBlockTokens --word-array-name=textBlockList --enum
$(sw_INC)/TextBlockTokens.gperf
$(GPERF) --compare-strncmp --readonly-tables -T
$(sw_INC)/BlockListTokens.gperf \
--class-name=BlockListTokens --word-array-name=blockListList >>
$(sw_INC)/tokens.cxx
- sed -i $(if $(filter MACOSX,$(OS)),'') -e "s/(char\*)0/(char\*)0,
XML_TOKEN_INVALID/g" $(sw_INC)/tokens.cxx
- sed -i $(if $(filter MACOSX,$(OS)),'') -e "/^#line/d"
$(sw_INC)/tokens.cxx
+ sed -i $(if $(filter MACOSX,$(OS_FOR_BUILD)),'') -e
"s/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g" $(sw_INC)/tokens.cxx
+ sed -i $(if $(filter MACOSX,$(OS_FOR_BUILD)),'') -e "/^#line/d"
$(sw_INC)/tokens.cxx
$(call gb_CustomTarget_get_target,sw/generated) : $(sw_INC)/tokens.cxx
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
