From patchwork Tue Sep 15 18:00:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1364555 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=P1vWCZPm; 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 4BrWGz1P1cz9sSs for ; Wed, 16 Sep 2020 04:00:27 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 09ED62285E; Tue, 15 Sep 2020 18:00:25 +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 YQSSQCkRt5Ve; Tue, 15 Sep 2020 18:00:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 61C6E207EF; Tue, 15 Sep 2020 18:00:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 385CB1BF59E for ; Tue, 15 Sep 2020 18:00:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 348D486A6D for ; Tue, 15 Sep 2020 18:00:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id h9-LPHx9m6HY for ; Tue, 15 Sep 2020 18:00:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by whitealder.osuosl.org (Postfix) with ESMTPS id 54C9E86988 for ; Tue, 15 Sep 2020 18:00:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1600192808; bh=4kuevZZXOrCc2GhqD2mmReihz8KI5bhDVHqleJRbyyI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=P1vWCZPm0Sc30fNPubeLBT39Cx8FxuOV4J7zIgQ2bMLx/6fJI/E/mSKWAXi/Dhka5 GPj8nm6fzDUru3BA94++h+jAuwv6WHHzFlNLHpGcDNz7P5obCxVT5h3o6g2y5mBGto fly9ayZGj+uSaMwBjOWzxt+KryKFpQTgmxUGFIvQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.149]) by mail.gmx.com (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MO9zH-1k743V1IbZ-00OWcp; Tue, 15 Sep 2020 20:00:08 +0200 From: Peter Seiderer To: buildroot@busybox.net Date: Tue, 15 Sep 2020 20:00:04 +0200 Message-Id: <20200915180004.2335-3-ps.report@gmx.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200915180004.2335-1-ps.report@gmx.net> References: <20200915180004.2335-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:G6SUhAjJ6AbBq1OwfVUMbbQEQwvEbn5sNQ8THRn8xN0Qg9ZoWPm IuzNUeeaaP5C2RDKa+ze47zmVqiQPagyYftF7zv2JN7I8QxFChBSfgpZbUswcFGagavTdZP kXTOIKuJCQLwVwfoptvqfuKXYeLuaWER7TBBrdLlwm5t9Z0XvParGZ66HJRnM/NjCIFYkUs HRFj5Z7yJErsU2TkAFAtg== X-UI-Out-Filterresults: notjunk:1;V03:K0:C935zrtbZuU=:hcZwr2kc3+jbT1cx0bkY/s 29uG9UDy8rtZTBVzZ+b1vDIcjlEFPcVwRShxKyX6b6OZNTJGyWb/0Tv+4sg04IsYlqLXJOYj4 o/moAj8377sOd8KWJgv48ane4+Vo/H73Oi8PSjcDyPSr5qrcTKJSsBe3f56PP6FbhsizR4owt 26JnCzSsuLesBVbLhNtDPHWZbu0tUYYk83Pbp4g/HAt71xyixp6h5ygYKRPVHt9kFN4y1uriZ urrc2Bkgyzh+O+ILPhO50OzS6IJkBE0edRFVBiwp8Oo2DQHZDmutJpHqKSJW4t8D0ncUsgtJA 7vMN9F4HaHPzED/p26IJBryOQu9MrO9eVj/mbhwqnzC9yWLq+Bp8QpNkMjq/g3FPYQK+EWlBU Sqckw45RHgi3Hd5t7xMy9OUcE1aR3XqmO0gw5ogfJ/IvBajbGCTHm1PrCALsWKaOaVFYrA6sH hW+L3yMPIw6woLHC05guyq8Kwm2nLCXRPPaG6K5cAvIxW9fovsRIXGiPWL3wCmkrwWY5PATsG qMDZpkHV6K9rp1M1o/84NK7w6YbOSoO5HJK6XT6//mK8iUVgr8OHPiYTJsPUm82DsCfWn/3F0 ONu4AgNy/v+X0XWk4omwAmTdcLVoVPbiWd+JKOHA/W1sAL+6xOeE8+fAOICW+UCXK510ToVSI So5mw/GzyNIvp+zqJaZu5ocmzb+Ei/rnPtZbPojQUbT7vIVUYBX+Qf6hpTNgvppz1UwGmIYjd oXxPCkwB7QBFtZwS/puSzAwjXwka4zlnb6EyFopISc7LAF1anf51NGed+ADMIRc5Oqft8ofWc 7fhTZOxV6wPN1s0EBl9tOR+G2vWa4k2HPVKZ0pF3e92YRbBqDbrCE9r/MMbzhoS7+hAliz/9Q ZufgelnYmVXVQoIYrDta6bHi3FYN3gQ7NFQlAK8+XYWOgD5TP3+gH9s40032xU2eiS/EJLPH+ hI1d6ZfcDOF2PQEoYPAfJotURZuALgJUzn/oncRrwjDzuQJvIdiMR+JkQtlkMmhn9+IzPYLv2 6N0mTf2kJ0LNYZJvMSI/E5vyleFpdnCLvyhnUJjPQ9QBrmp8JXe8ABjf3BqP0TYgz7gqgghqx VNV1qBHXrRh7WcyIwpo4/UqiHMo68dMIdaF5tR91xpiH42uwSwEhMkPIyCkrBv22hFT5n6RNM tmzqOYRNNOUQjDH6IzOr68O4QCNmN+wNqPdzOneoieW72ljiVr2OeL3CXmGznZAFpFr3WE/wI VqTcgL8NXqSIWUjWoZDXSptB2lCTao/01PsNg2g== Subject: [Buildroot] [PATCH v1 3/3] package/qt5webkit: fix bison-3.7.1 related compile failure 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: Joshua Henderson , Bartosz Bilas , Julien Corjon , =?utf-8?q?Ga=C3=ABl_Portay?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add gentoo patch to fix bison-3.7.1 related compile failure and an additional one doing a similare change for another bison call in Source/WebCore/DerivedSources.pri. Fixes: generated/XPathGrammar.tab.c:124:10: fatal error: XPathGrammar.tab.h: No such file or directory Signed-off-by: Peter Seiderer --- ...te-the-header-directly-to-fix-build-.patch | 52 +++++++++++++++++++ ...te-the-header-directly-to-fix-build-.patch | 31 +++++++++++ 2 files changed, 83 insertions(+) create mode 100644 package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch create mode 100644 package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch diff --git a/package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch b/package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch new file mode 100644 index 0000000000..7bb81b1259 --- /dev/null +++ b/package/qt5/qt5webkit/0007-Let-Bison-generate-the-header-directly-to-fix-build-.patch @@ -0,0 +1,52 @@ +From 894a5448ee8ce0f134845c877b4c0a2a660e4ab3 Mon Sep 17 00:00:00 2001 +From: Dmitry Shachnev +Date: Tue, 4 Aug 2020 21:04:06 +0300 +Subject: [PATCH] Let Bison generate the header directly, to fix build with + Bison 3.7 + +Starting with Bison 3.7, the generated C++ file #include's the header +by default, instead of duplicating it. So we should not delete it. + +Remove the code to add #ifdef guards to the header, since Bison adds +them itself since version 2.6.3. + +[Original patch taken from +https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch?id=69e618c88a9134f754264efc11aa0b1fdc028b88 +ported to qtwebkit-opensource-src-5.9.1] +Signed-off-by: Peter Seiderer +--- + Source/WebCore/css/makegrammar.pl | 21 +-------------------- + 1 file changed, 1 insertion(+), 20 deletions(-) + +diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl +index 4e0452ed..9ef32963 100644 +--- a/Source/WebCore/css/makegrammar.pl ++++ b/Source/WebCore/css/makegrammar.pl +@@ -73,23 +73,4 @@ if ($suffix eq ".y.in") { + } + + my $fileBase = File::Spec->join($outputDir, $filename); +-system("$bison -d -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp"); +- +-open HEADER, ">$fileBase.h" or die; +-print HEADER << "EOF"; +-#ifndef CSSGRAMMAR_H +-#define CSSGRAMMAR_H +-EOF +- +-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die; +-while () { +- print HEADER; +-} +-close HPP; +- +-print HEADER "#endif\n"; +-close HEADER; +- +-unlink("$fileBase.cpp.h"); +-unlink("$fileBase.hpp"); +- ++system("$bison --defines=$fileBase.h -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp"); +-- +2.28.0 + diff --git a/package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch b/package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch new file mode 100644 index 0000000000..9deb2d8c63 --- /dev/null +++ b/package/qt5/qt5webkit/0008-let-bison-generate-the-header-directly-to-fix-build-.patch @@ -0,0 +1,31 @@ +From 8959e226fac7f73b9a40e202610bd5e12334561b Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Tue, 15 Sep 2020 19:11:18 +0200 +Subject: [PATCH] let bison generate the header directly, to fix build with + bison 3.7 + +Do the same as the patch taken from [1] for the bison call in +Source/WebCore/DerivedSources.pri to fix file generation +for bison 3.7. + +Signed-off-by: Peter Seiderer +--- + Source/WebCore/DerivedSources.pri | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri +index 57a6b0f7..e9f52614 100644 +--- a/Source/WebCore/DerivedSources.pri ++++ b/Source/WebCore/DerivedSources.pri +@@ -987,7 +987,7 @@ GENERATORS += pluginsresources + # GENERATOR 11: XPATH grammar + xpathbison.output = ${QMAKE_FILE_BASE}.cpp + xpathbison.input = XPATHBISON +-xpathbison.commands = bison -d -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.tab.c && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.c ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.cpp && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.h ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.h ++xpathbison.commands = bison --defines=${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.h -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.cpp + xpathbison.depends = ${QMAKE_FILE_NAME} + GENERATORS += xpathbison + +-- +2.28.0 +