forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-qt/qtwebkit: Fix build with sys-devel/bison-3.7
Closes: https://bugs.gentoo.org/736499 Package-Manager: Portage-3.0.3, Repoman-3.0.0 Signed-off-by: Andreas Sturmlechner <[email protected]>
- Loading branch information
Showing
2 changed files
with
48 additions
and
0 deletions.
There are no files selected for viewing
46 changes: 46 additions & 0 deletions
46
dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001 | ||
From: Dmitry Shachnev <[email protected]> | ||
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. | ||
--- | ||
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 5d63b08102eb..9435701c7061 100644 | ||
--- a/Source/WebCore/css/makegrammar.pl | ||
+++ b/Source/WebCore/css/makegrammar.pl | ||
@@ -73,25 +73,6 @@ | ||
} | ||
|
||
my $fileBase = File::Spec->join($outputDir, $filename); | ||
-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); | ||
+my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); | ||
push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives. | ||
system(@bisonCommand) == 0 or die; | ||
- | ||
-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 (<HPP>) { | ||
- print HEADER; | ||
-} | ||
-close HPP; | ||
- | ||
-print HEADER "#endif\n"; | ||
-close HEADER; | ||
- | ||
-unlink("$fileBase.cpp.h"); | ||
-unlink("$fileBase.hpp"); | ||
- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters