i18npool/CustomTarget_localedata.mk | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 14eeed686c5490ddbd356c1ac807b16231e4cb88
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Mon Dec 20 10:07:16 2021 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Mon Dec 20 19:47:43 2021 +0100
Just recompile changed generated localedata
Also use random temporary files.
Change-Id: If59a9f3ac8e736272ad51747c6a032351a6bec39
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127138
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/i18npool/CustomTarget_localedata.mk
b/i18npool/CustomTarget_localedata.mk
index 348b360376ab..e4b1d1fb0339 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -21,13 +21,14 @@ $(call
gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_$(1).cxx : \
$(call gb_Executable_get_runtime_dependencies,saxparser)
$$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),$(true),SAX,1)
$$(call gb_Trace_StartRange,$$(subst $(WORKDIR)/,,$$@),SAX)
+ TEMPSAX=$$(shell $$(gb_MKTEMP)) && TEMPSED=$$(shell $$(gb_MKTEMP)) && \
$$(call gb_Helper_abbreviate_dirs, \
$$(call gb_Helper_print_on_error, \
- $$(call gb_Helper_execute,saxparser) $(1) $$< $$@.tmp \
+ $$(call gb_Helper_execute,saxparser) $(1) $$<
$$$${TEMPSAX} \
-env:LO_LIB_DIR=$(call
gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER)) \
-env:URE_MORE_SERVICES=$(call
gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,saxparser))) && \
- sed 's/\(^.*get[^;]*$$$$\)/SAL_DLLPUBLIC_EXPORT \1/' $$@.tmp >
$$@ && \
- rm $$@.tmp)
+ sed 's/\(^.*get[^;]*$$$$\)/SAL_DLLPUBLIC_EXPORT \1/'
$$$${TEMPSAX} > $$$${TEMPSED} && \
+ rm $$$${TEMPSAX} && $(call
gb_Helper_replace_if_different_and_touch,$$$${TEMPSED},$$@))
$$(call gb_Trace_EndRange,$$(subst $(WORKDIR)/,,$$@),SAX)
endef
