| 1 |
commit: 5f6cb896224af37d7907cc4844b7ae5bf7415483 |
| 2 |
Author: Huang Rui <vowstar <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Aug 23 07:10:12 2020 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 5 |
CommitDate: Sun Aug 23 07:10:12 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5f6cb896 |
| 7 |
|
| 8 |
sci-electronics/verilator: backport patches from upstream |
| 9 |
|
| 10 |
Backport patches for old versions |
| 11 |
|
| 12 |
Package-Manager: Portage-3.0.3, Repoman-3.0.0 |
| 13 |
Signed-off-by: Huang Rui <vowstar <AT> gmail.com> |
| 14 |
|
| 15 |
sci-electronics/verilator/Manifest | 1 + |
| 16 |
.../files/verilator-4.034-fix-bison.patch | 30 ++++++++++------------ |
| 17 |
...rilator-4.038.ebuild => verilator-4.032.ebuild} | 2 ++ |
| 18 |
sci-electronics/verilator/verilator-4.034.ebuild | 2 ++ |
| 19 |
sci-electronics/verilator/verilator-4.036.ebuild | 4 +-- |
| 20 |
sci-electronics/verilator/verilator-4.038.ebuild | 4 +-- |
| 21 |
6 files changed, 22 insertions(+), 21 deletions(-) |
| 22 |
|
| 23 |
diff --git a/sci-electronics/verilator/Manifest b/sci-electronics/verilator/Manifest |
| 24 |
index b383ef2..0966b7c 100644 |
| 25 |
--- a/sci-electronics/verilator/Manifest |
| 26 |
+++ b/sci-electronics/verilator/Manifest |
| 27 |
@@ -1,3 +1,4 @@ |
| 28 |
+DIST verilator-4.032.tar.gz 2497830 BLAKE2B eb318e0326be9f72b32bd98f8a6de74516bda4bdf2d21d572c72e92759a4ee64e514fdb3dae20c8bea40e72d493775a02766e7ea619dd8eb541f3450278b0b20 SHA512 2b34d0b6d94babb74b443b3f3ae4e6c9f15423a0b078df72930c4f75b4a831843a4d4b901dc586725a67a49c6f5308402fef4c9ca72b88b13b01746b36d2fb20 |
| 29 |
DIST verilator-4.034.tar.gz 1998271 BLAKE2B 456ee4c8e7d28dd979f74cd8c6b5e734d33267b5dba1926f82b6827fbc1b2625aafc4f4d088c961be1632957966ab350767f836ed7eee1f1f01b4315f1c8f2b2 SHA512 5651cf2c102df10b3784799968f8e554d0116487a962b99fd03526b71af67cb49c932eaaef260b19cbfc80a47747dd6e8d04b461f663522cd1f05ad9843002d3 |
| 30 |
DIST verilator-4.036.tar.gz 2064470 BLAKE2B 210d39747e132ce1de8673e971c8765a28eeb23f30902dd032acb67a6d5f9fce2eae8c4edec00b839c6e81ff0985a99e4b065b4a570531f393d47802121eea93 SHA512 2f83bf144346aed4ff6bd208af56ed19cbe562c51324b8dc3243419b63734ff15c805fd6e7d5c2109af9cf51f7d44e249d7f1cc1a383bab428503de317e1d60c |
| 31 |
DIST verilator-4.038.tar.gz 2085353 BLAKE2B 330162ed8786b6ac1127e844224ad4a3cfc20e6bc2bbf8f1662ae23e3b18b8b908b145390a2e284ff2b70299b9475d25da7eb23643c70b617d95061c7a4a79c3 SHA512 a963aeccd4bb36a3ac39a5e831ec2600b87c0b46c787fa38900b7bd0ae59fb75dbfaf6261d1050ae1bd29fdb8b0b6a1957f08559c36c498f49738819b4d56d68 |
| 32 |
|
| 33 |
diff --git a/sci-electronics/verilator/files/verilator-4.034-fix-bison.patch b/sci-electronics/verilator/files/verilator-4.034-fix-bison.patch |
| 34 |
index 56d680a..b7eb095 100644 |
| 35 |
--- a/sci-electronics/verilator/files/verilator-4.034-fix-bison.patch |
| 36 |
+++ b/sci-electronics/verilator/files/verilator-4.034-fix-bison.patch |
| 37 |
@@ -1,17 +1,13 @@ |
| 38 |
-diff --git a/src/Makefile_obj.in b/src/Makefile_obj.in |
| 39 |
-index 911f97e1..63799569 100644 |
| 40 |
---- a/src/Makefile_obj.in |
| 41 |
-+++ b/src/Makefile_obj.in |
| 42 |
-@@ -323,6 +323,12 @@ V3ParseBison.h: V3ParseBison.c |
| 43 |
- V3ParseBison.c: verilog.y $(BISONPRE) |
| 44 |
- @echo "If you get errors from verilog.y below, try upgrading bison to version 1.875 or newer." |
| 45 |
- $(PERL) $(BISONPRE) --yacc ${YACC} -d -v -o V3ParseBison.c $< |
| 46 |
-+ # Unfortunately bison 3.6.1 have break changes caused compile error. |
| 47 |
-+ # Workaround issue https://github.com/verilator/verilator/issues/2320 |
| 48 |
-+ # This workaround is safe for the old version of bison. |
| 49 |
-+ # TODO: code should removed when bison fixed the problem. |
| 50 |
-+ @sed -ie 's#/\* "/\*.*\*/" \*/##g' V3ParseBison.c |
| 51 |
-+ @sed -ie 's#/\* "/\*.*\*/" \*/##g' V3ParseBison.h |
| 52 |
- |
| 53 |
- V3Lexer_pregen.yy.cpp: verilog.l V3ParseBison.h $(HEADERS) |
| 54 |
- ${LEX} --version |
| 55 |
+diff --git a/src/bisonpre b/src/bisonpre |
| 56 |
+index 39597957..48cf26eb 100755 |
| 57 |
+--- a/src/bisonpre |
| 58 |
++++ b/src/bisonpre |
| 59 |
+@@ -212,6 +212,8 @@ sub clean_output { |
| 60 |
+ $line =~ s!\(YY_\("!(YY_((char*)"!g; |
| 61 |
+ # Fix bison 2.3 glr-parser warning about yyerrorloc.YYTYPE::yydummy uninit |
| 62 |
+ $line =~ s!(YYLTYPE yyerrloc;)!$1 yyerrloc.yydummy=0;/*bisonpre*/!g; |
| 63 |
++ # Fix bison 3.6.1 unexpected nested-comment |
| 64 |
++ $line =~ s!/\* "/\*.*\*/" \*/!!g; |
| 65 |
+ $fh->write($line); |
| 66 |
+ } |
| 67 |
+ $fh->close; |
| 68 |
|
| 69 |
diff --git a/sci-electronics/verilator/verilator-4.038.ebuild b/sci-electronics/verilator/verilator-4.032.ebuild |
| 70 |
similarity index 90% |
| 71 |
copy from sci-electronics/verilator/verilator-4.038.ebuild |
| 72 |
copy to sci-electronics/verilator/verilator-4.032.ebuild |
| 73 |
index bf099b7..e308400 100644 |
| 74 |
--- a/sci-electronics/verilator/verilator-4.038.ebuild |
| 75 |
+++ b/sci-electronics/verilator/verilator-4.032.ebuild |
| 76 |
@@ -39,6 +39,8 @@ BDEPEND=" |
| 77 |
PATCHES=( |
| 78 |
# https://github.com/verilator/verilator/issues/2320 |
| 79 |
"${FILESDIR}"/${PN}-4.034-fix-bison.patch |
| 80 |
+ # https://github.com/verilator/verilator/pull/2505 |
| 81 |
+ "${FILESDIR}"/${PN}-4.040-fix-bison.patch |
| 82 |
) |
| 83 |
|
| 84 |
src_prepare() { |
| 85 |
|
| 86 |
diff --git a/sci-electronics/verilator/verilator-4.034.ebuild b/sci-electronics/verilator/verilator-4.034.ebuild |
| 87 |
index bf099b7..e308400 100644 |
| 88 |
--- a/sci-electronics/verilator/verilator-4.034.ebuild |
| 89 |
+++ b/sci-electronics/verilator/verilator-4.034.ebuild |
| 90 |
@@ -39,6 +39,8 @@ BDEPEND=" |
| 91 |
PATCHES=( |
| 92 |
# https://github.com/verilator/verilator/issues/2320 |
| 93 |
"${FILESDIR}"/${PN}-4.034-fix-bison.patch |
| 94 |
+ # https://github.com/verilator/verilator/pull/2505 |
| 95 |
+ "${FILESDIR}"/${PN}-4.040-fix-bison.patch |
| 96 |
) |
| 97 |
|
| 98 |
src_prepare() { |
| 99 |
|
| 100 |
diff --git a/sci-electronics/verilator/verilator-4.036.ebuild b/sci-electronics/verilator/verilator-4.036.ebuild |
| 101 |
index bf099b7..38ade43 100644 |
| 102 |
--- a/sci-electronics/verilator/verilator-4.036.ebuild |
| 103 |
+++ b/sci-electronics/verilator/verilator-4.036.ebuild |
| 104 |
@@ -37,8 +37,8 @@ BDEPEND=" |
| 105 |
" |
| 106 |
|
| 107 |
PATCHES=( |
| 108 |
- # https://github.com/verilator/verilator/issues/2320 |
| 109 |
- "${FILESDIR}"/${PN}-4.034-fix-bison.patch |
| 110 |
+ # https://github.com/verilator/verilator/pull/2505 |
| 111 |
+ "${FILESDIR}"/${PN}-4.040-fix-bison.patch |
| 112 |
) |
| 113 |
|
| 114 |
src_prepare() { |
| 115 |
|
| 116 |
diff --git a/sci-electronics/verilator/verilator-4.038.ebuild b/sci-electronics/verilator/verilator-4.038.ebuild |
| 117 |
index bf099b7..38ade43 100644 |
| 118 |
--- a/sci-electronics/verilator/verilator-4.038.ebuild |
| 119 |
+++ b/sci-electronics/verilator/verilator-4.038.ebuild |
| 120 |
@@ -37,8 +37,8 @@ BDEPEND=" |
| 121 |
" |
| 122 |
|
| 123 |
PATCHES=( |
| 124 |
- # https://github.com/verilator/verilator/issues/2320 |
| 125 |
- "${FILESDIR}"/${PN}-4.034-fix-bison.patch |
| 126 |
+ # https://github.com/verilator/verilator/pull/2505 |
| 127 |
+ "${FILESDIR}"/${PN}-4.040-fix-bison.patch |
| 128 |
) |
| 129 |
|
| 130 |
src_prepare() { |
Archives