openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1862776 - /openoffice/trunk/main/i18npool/Library_i18npool.mk
Date Mon, 08 Jul 2019 19:51:50 GMT
Author: damjan
Date: Mon Jul  8 19:51:50 2019
New Revision: 1862776

URL: http://svn.apache.org/viewvc?rev=1862776&view=rev
Log:
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


Modified:
    openoffice/trunk/main/i18npool/Library_i18npool.mk

Modified: openoffice/trunk/main/i18npool/Library_i18npool.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/i18npool/Library_i18npool.mk?rev=1862776&r1=1862775&r2=1862776&view=diff
==============================================================================
--- openoffice/trunk/main/i18npool/Library_i18npool.mk (original)
+++ openoffice/trunk/main/i18npool/Library_i18npool.mk Mon Jul  8 19:51:50 2019
@@ -144,7 +144,7 @@ $(WORKDIR)/CustomTarget/i18npool/source/
 
 
 # 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)
 
 



Mime
View raw message