From patchwork Fri Sep 18 19:58:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1367278 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=OguCDxHp; 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 4BtPn94cW3z9sSC for ; Sat, 19 Sep 2020 05:59:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D300F2E211; Fri, 18 Sep 2020 19:59:39 +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 03Ob5YxcLX+D; Fri, 18 Sep 2020 19:59:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 95DF02E245; Fri, 18 Sep 2020 19:59:14 +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 D26131BF31B for ; Fri, 18 Sep 2020 19:59:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CFB5F87363 for ; Fri, 18 Sep 2020 19:59:11 +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 Qnck3pwoIXso for ; Fri, 18 Sep 2020 19:59:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by whitealder.osuosl.org (Postfix) with ESMTPS id 24DC486829 for ; Fri, 18 Sep 2020 19:59:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1600459135; bh=ShQNwl02BsXQUgvQ9IOUYWc+WPzbQXK0fKTxlfZvsOg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=OguCDxHp3LcXolXRJ+lkc9G+H9rGqMduH2VlZTS4rwocNeVfqy3npKSX9rV0ioCEb +/gUQ6z9OjUoDUrQrGpn5izIzTggDCOYJf8/u+wUcYPxBykbum4S4nNNRsolS3jHxj OlIxTIdAgFWHZfO0ufmMWP31lItnFRmK599i6YVk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.215]) by mail.gmx.com (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MLQxN-1k26lI2Cbj-00IX9N; Fri, 18 Sep 2020 21:58:55 +0200 From: Peter Seiderer To: buildroot@busybox.net Date: Fri, 18 Sep 2020 21:58:50 +0200 Message-Id: <20200918195852.6999-1-ps.report@gmx.net> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:wvittgoU/4Fdc/xGRYYTSoDIedQetmS82Ht/cvpqwU5Y2HhfSOQ zrLbShr3p6qTiUT2xFtmCv052jAptGFz9Y2jmvS4Ih4b1uXwOVMFwR5kbtS/bWzZCBQijIY EAUB6W5ECsJWsQG2SBtDNtaMRysFrOO5VgCPEdG/7y/VBJHSDEAkg+7QqRxtWUzLUuEy6db rUBGx+4foXcVMh51UB/iQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:Bf89DaN69Ws=:SX8jDjmOe1v2CkCtbckyaw 8KNppyPtAUu1wtxN0JGAHoU7/R1/kv8j3mO66DI82/4ZSC+bdF4dxWqxLuybb+b/z8O1TBnEA RQXPOheq9J1H3jB/T48Raz0PetTkwqU1RHWmNRysyHOksKano3LJeL4t8zfTW1ce/M1sdOr3t y0VuuPYEAK+ivWYsLMkBW1VNljBYg9piPt4T9lhKEGGVAwsZhrWHu6HKCHPQ6ukah/Ljzot/M PLp17VRKMpyUYxcfvQDxbpHNgvbUoZQGhq2p9PRvhkI3Yc6E9b/Yta82RkNUkqw+C6cM9s4R/ HBr7aJUwWQha2vaCZVlayA8nbhWYCSCs6ln6T/KWrKDGI+UOykODLAYKtPurVtff375+pNHvu 8NuAU5Cq6MIdj0o3TjHpiSkwKLBuk69Q78gUHmA8Xo8c/m5L5oKLz+gYYmr8djhuGVHj3k+ts dT73RBY0iRXVd7p8jGR5OSBZESYPc8phJfKdLO1RVfdxNhhDASC7XRdNX4b1PguBJwoWPUr67 qpjUXlKhVK4/dADO+EQQghPlnnb6Ef20ByjF1gx80jsostBWlnn7aVxzkI9q7IUJ8YTM/EBl1 icOJtgR/zzCxoska9JCA/Q8YSACrGbll2FoNdejblKMZlWTeVBCfwVM9Q6drVAb2CKMHEN4dJ hr5OGgwsOQEW0b4Jqa4QgNilrLMXIHvmxiqeeTUh4wdqVbrwI4rHuS3DkhfT6zsUZjf5LnOuA TvcPxS9cF4AJBFAHrRFUg92Z4GUqpk0knUNMn82AS+KnHeoF6Z53FipFCb39Jsx6FrjQXcx+v tCUcVSATwQMjtt2+BK7r6fVNFSSMVNGNWojEdZR/xCOI5zLLuiJpFDc1HLt2m6odGUtUB3nES d2RkSeFGmqjirZFRziMdZgHQhg0ap1LBuU1UjC6rrWF/mZOQNG/QWvUtljYEfkV9lL/GT6dqg lty4hmvAEup/Izdki8IfEkr9ibWSgsMXgggZNfW9Mi6bUwDZvu3uYrSdYoqjjt4NG0+yGDRb2 MlNVKNZtfg+ny5OwFG7fxtIv8vgzaiFjUNBD6upR6bvBxsfNN7b7csboXpioD5/5WPGYXZspQ Qjoeq9scOTQKR0Mr/j0BAsHMCobIxiaQXT7G3viCLHobAmI49DZ+gwZx3rxjGtTCSLSQ1vfL/ F4xrqR1ZWokMVklZV2NQsGf3rgnkR7wriVsSqrRJDq9j0pLn60/rPsEmJ9TNoqPL6o1rXhxxA +1bZmj/cuShNQ8BZlV7YQMSapyabDG+JN23OoPg== Subject: [Buildroot] [PATCH v2 1/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 --- Changes v1 -> v2: - re-ordered to first patch as needed by qt5webkit-5.9.1/qt-5.15.0 (before qt version bump) --- ...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 +