From patchwork Fri Sep 13 12:47:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Skvortsov X-Patchwork-Id: 1162060 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Fh/+i74n"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46VFmh2mvcz9sN1 for ; Fri, 13 Sep 2019 22:48:20 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A64DC2288F; Fri, 13 Sep 2019 12:48:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NLx6RdpAKJPx; Fri, 13 Sep 2019 12:48:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B26DD228B3; Fri, 13 Sep 2019 12:48:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id BE5AF1BF573 for ; Fri, 13 Sep 2019 12:48:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B7FF486597 for ; Fri, 13 Sep 2019 12:48:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xrb5VovoYC9k for ; Fri, 13 Sep 2019 12:48:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by hemlock.osuosl.org (Postfix) with ESMTPS id BE12A857D6 for ; Fri, 13 Sep 2019 12:48:05 +0000 (UTC) Received: by mail-lj1-f195.google.com with SMTP id q22so22383279ljj.2 for ; Fri, 13 Sep 2019 05:48:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uezs4fIfEtG9qrxVmWBlnop+WOvbaVEJaSeVBbWzbAM=; b=Fh/+i74npzTr9Xd1SLWYEHuPrCtjVK15Daf1GrCbx2+GJW75fHxvrmppDiPGr8C9Kr HCtq4IawpW/WCvg6LD7yn5dkV2MLWGltvgAXUNr+T+1MQvIzAsQmJPRaiE6V0871YpEI REMC9mhYf32ldq7ApeXHdC1yPgZk4PwXHbogGkJm7WxxXUMvdNdQZyDv2KXHHJHwP9GM MeA9ruNYEfpKSVyUdbPpg4AOGMw1YrGYeSx4s2NhGXPCp2OcqBCIiNzO7x3axX6MIz8b vT6TYEIja7nYiU11syoJAeXGJrNJAEmx8W8cE94/JmSui5Aw1mEyWi+XoSGNQvxSszKc UcMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uezs4fIfEtG9qrxVmWBlnop+WOvbaVEJaSeVBbWzbAM=; b=Y6wpBDkwG1xmCmhluP4fUKoNh4MP1vaCBcj8HRRNkF2zy93cnpRZBcKFqxdA2jZdxA sGPQCz88fAPJBw9D2RCBlO64n1Wcgviqw8vf6vnXuKRUGws/68pooi2uiCeBKrOQOwIj ICBPmR6+QTKDyzJAVbfVdZfye8reXNYG95AG49EDvHJ/ND9LQ6bjVr91xCucqIaKGmpk td7C2OvfKgqQq8jqhZCWUIEJwE9nI1ZABkqPEdip8uCgTTFcnNs8M8WR/wJeWWG9AklY 3jDSlMfOgxqPTq+96KnlKQPLLitoSMelTEyAOWdyRSIiIzGJlxFZ12yDkqC3cERzLboY 5ssg== X-Gm-Message-State: APjAAAU4L6QOcRPQg2qf94o8v9Ewh+uyK6yt1kkyNxPkWGa3+W81IUg4 cu9nwCOahk/9Ovgx7EQQZSsOIFD5 X-Google-Smtp-Source: APXvYqw9bon/GC+1cYgK+jSZDd5YpwWcBuSl6juKfWwLSj26ndYtSnRAeSE/mIYUx7K4VMoq5grsaw== X-Received: by 2002:a05:651c:1021:: with SMTP id w1mr22069582ljm.145.1568378883673; Fri, 13 Sep 2019 05:48:03 -0700 (PDT) Received: from localhost.localdomain ([188.243.226.168]) by smtp.gmail.com with ESMTPSA id o2sm6869320lfl.20.2019.09.13.05.48.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Sep 2019 05:48:03 -0700 (PDT) From: Andrey Skvortsov To: buildroot@buildroot.org Date: Fri, 13 Sep 2019 15:47:53 +0300 Message-Id: <20190913124753.24307-1-andrej.skvortzov@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: fix icu detection in Qt 5.6.3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Seiderer , Andrey Skvortsov Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" icu is required to build Q5tWebkit. When UChar is defined as char16_t in ICU, then qtbase fails to detect ICU. The issue is described https://bugreports.qt.io/browse/QTBUG-49586 Build fails with following error messages: ... ustring.h:473:20: error: ‘UChar’ does not name a type u_strCompare(const UChar *s1, int32_t length1, ^ ^ make[2]: *** [Makefile:195: icu.o] Error 1 ICU disabled. The ICU library support cannot be enabled. Signed-off-by: Andrey Skvortsov --- .../0004-fix-icu-build-for-qt5webkit.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/qt5/qt5base/5.6.3/0004-fix-icu-build-for-qt5webkit.patch diff --git a/package/qt5/qt5base/5.6.3/0004-fix-icu-build-for-qt5webkit.patch b/package/qt5/qt5base/5.6.3/0004-fix-icu-build-for-qt5webkit.patch new file mode 100644 index 0000000000..849770e2e0 --- /dev/null +++ b/package/qt5/qt5base/5.6.3/0004-fix-icu-build-for-qt5webkit.patch @@ -0,0 +1,39 @@ +diff -purN qt5base-5.6.3.orig/config.tests/unix/compile.test qt5base-5.6.3/config.tests/unix/compile.test +--- qt5base-5.6.3.orig/config.tests/unix/compile.test 2019-08-11 00:35:33.181545706 +0300 ++++ qt5base-5.6.3/config.tests/unix/compile.test 2017-09-06 15:13:54.000000000 +0300 +@@ -47,7 +47,7 @@ while [ "$#" -gt 0 ]; do + INC=`echo $PARAM | sed -e 's/^-I//'` + INCLUDEPATH="$INCLUDEPATH \"$INC\"" + ;; +- -f*|-D*) ++ -f*|-D*|-std=*) + CFLAGS="$CFLAGS \"$PARAM\"" + CXXFLAGS="$CXXFLAGS \"$PARAM\"" + ;; +diff -purN qt5base-5.6.3.orig/configure qt5base-5.6.3/configure +--- qt5base-5.6.3.orig/configure 2019-08-11 00:57:45.488214036 +0300 ++++ qt5base-5.6.3/configure 2017-09-06 15:13:54.000000000 +0300 +@@ -5183,8 +5183,10 @@ fi + + # auto-detect libicu support + if [ "$CFG_ICU" != "no" ]; then ++ QT_CXXFLAGS_ICU="-std=c++11" ++ if compileTest unix/icu "ICU" $QT_CXXFLAGS_ICU; then +- if compileTest unix/icu "ICU"; then + [ "$CFG_ICU" = "auto" ] && CFG_ICU=yes ++ QMakeVar set QT_CXXFLAGS_ICU "$QT_CXXFLAGS_ICU" + else + if [ "$CFG_ICU" = "auto" ]; then + CFG_ICU=no +diff -purN qt5base-5.6.3.orig/doc/Makefile qt5base-5.6.3/doc/Makefile +diff -purN qt5base-5.6.3.orig/src/corelib/tools/tools.pri qt5base-5.6.3/src/corelib/tools/tools.pri +--- qt5base-5.6.3.orig/src/corelib/tools/tools.pri 2019-08-11 00:45:45.073818635 +0300 ++++ qt5base-5.6.3/src/corelib/tools/tools.pri 2017-09-06 15:13:54.000000000 +0300 +@@ -169,6 +169,7 @@ contains(QT_CONFIG,icu) { + tools/qcollator_icu.cpp \ + tools/qtimezoneprivate_icu.cpp + DEFINES += QT_USE_ICU ++ QMAKE_CXXFLAGS += $$QT_CXXFLAGS_ICU + } else: win32 { + SOURCES += tools/qcollator_win.cpp + } else: macx {