i18npool/Library_i18npool.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit e3336e2088ba1dd1d07be81188ad5696fbaad193 Author: Damjan Jovanovic <[email protected]> AuthorDate: Mon Jul 8 19:51:50 2019 +0000 Commit: Damjan Jovanovic <[email protected]> CommitDate: Mon Jul 8 19:51:50 2019 +0000 Don't include icuversion.mk if it wasn't delivered (when using system ICU). Fixes: #i128148# build in trunk fails because of icu. Patch by: me diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index caa159764bed..25892a581575 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -144,7 +144,7 @@ $(WORKDIR)/CustomTarget/i18npool/source/collator/lrl_include.hxx : $(wildcard $( # fdo#31271 ")" reclassified in more recent ICU/Unicode Standards -include $(OUTDIR)/inc/icuversion.mk +-include $(OUTDIR)/inc/icuversion.mk ICU_RECLASSIFIED_BRACKET := $(shell [ ${ICU_MAJOR} -ge 5 -o \( ${ICU_MAJOR} -eq 4 -a ${ICU_MINOR} -ge 4 \) ] && echo YES) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
