From commits-return-54542-archive-asf-public=cust-asf.ponee.io@openoffice.apache.org Mon Jul 8 19:51:52 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 519F1180665 for ; Mon, 8 Jul 2019 21:51:52 +0200 (CEST) Received: (qmail 1070 invoked by uid 500); 8 Jul 2019 19:51:51 -0000 Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list commits@openoffice.apache.org Received: (qmail 1060 invoked by uid 99); 8 Jul 2019 19:51:51 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jul 2019 19:51:51 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id BD45B3A0B37 for ; Mon, 8 Jul 2019 19:51:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1862776 - /openoffice/trunk/main/i18npool/Library_i18npool.mk Date: Mon, 08 Jul 2019 19:51:50 -0000 To: commits@openoffice.apache.org From: damjan@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20190708195150.BD45B3A0B37@svn01-us-west.apache.org> 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)