| 1 |
commit: 6b19a658921bb5815ab5c9e7d3c0f3883054cf49 |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Mon Mar 1 19:51:48 2021 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 1 22:11:32 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b19a658 |
| 7 |
|
| 8 |
sci-electronics/iverilog: remove unused patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/19725 |
| 11 |
Package-Manager: Portage-3.0.15, Repoman-3.0.2 |
| 12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/iverilog-10.3-gen-bison-header.patch | 97 ---------------------- |
| 16 |
1 file changed, 97 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-electronics/iverilog/files/iverilog-10.3-gen-bison-header.patch b/sci-electronics/iverilog/files/iverilog-10.3-gen-bison-header.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 0027184c833..00000000000 |
| 21 |
--- a/sci-electronics/iverilog/files/iverilog-10.3-gen-bison-header.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,97 +0,0 @@ |
| 24 |
-From 5b699c1be73e789831db01e779a41478c0c62309 Mon Sep 17 00:00:00 2001 |
| 25 |
-From: Henner Zeller <h.zeller@×××.org> |
| 26 |
-Date: Wed, 29 Jul 2020 15:29:08 -0700 |
| 27 |
-Subject: [PATCH] Bison includes its generated header in *.cc. Generate with |
| 28 |
- correct name. |
| 29 |
- |
| 30 |
-The current bison (3.7) generates a *.cc file that includes the header |
| 31 |
-it generated. For parse.cc this would be parse.hh. Right now, we rename |
| 32 |
-this header to have a common name used in other files, but this results |
| 33 |
-in a compile error for the parse.cc file: |
| 34 |
- |
| 35 |
-parse.cc:462:10: fatal error: parse.hh: No such file or directory |
| 36 |
- 462 | #include "parse.hh" |
| 37 |
- | ^~~~~~~~~~ |
| 38 |
- |
| 39 |
-Fix this by telling bison to output the header file to the correct |
| 40 |
-filename in the first place so that we don't have to rename it. |
| 41 |
-(using the --defines instead of -d option). |
| 42 |
- |
| 43 |
-This looks like a bison specific option not available in Posix yacc; |
| 44 |
-but looks like we're requiring bison anyway. |
| 45 |
- |
| 46 |
-Signed-off-by: Henner Zeller <h.zeller@×××.org> |
| 47 |
---- |
| 48 |
- Makefile.in | 4 +--- |
| 49 |
- tgt-pcb/Makefile.in | 4 +--- |
| 50 |
- vhdlpp/Makefile.in | 4 +--- |
| 51 |
- vvp/Makefile.in | 4 +--- |
| 52 |
- 4 files changed, 4 insertions(+), 12 deletions(-) |
| 53 |
- |
| 54 |
-diff --git a/Makefile.in b/Makefile.in |
| 55 |
-index 5ac5515a..cc8cac46 100644 |
| 56 |
---- a/Makefile.in |
| 57 |
-+++ b/Makefile.in |
| 58 |
-@@ -256,10 +256,8 @@ parse.o: parse.cc |
| 59 |
- |
| 60 |
- # Build this in two steps to avoid parallel build issues (see pr3462585) |
| 61 |
- parse.cc: $(srcdir)/parse.y |
| 62 |
-- $(YACC) --verbose -t -p VL -d -o $@ $< |
| 63 |
-+ $(YACC) --verbose -t -p VL --defines=parse.h -o $@ $< |
| 64 |
- parse.h: parse.cc |
| 65 |
-- mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@ |
| 66 |
-- touch $@ |
| 67 |
- |
| 68 |
- syn-rules.cc: $(srcdir)/syn-rules.y |
| 69 |
- $(YACC) --verbose -t -p syn_ -o $@ $< |
| 70 |
-diff --git a/tgt-pcb/Makefile.in b/tgt-pcb/Makefile.in |
| 71 |
-index a5f9b7d5..7345e195 100644 |
| 72 |
---- a/tgt-pcb/Makefile.in |
| 73 |
-+++ b/tgt-pcb/Makefile.in |
| 74 |
-@@ -89,10 +89,8 @@ fp_lex.cc: $(srcdir)/fp.lex |
| 75 |
- $(LEX) -s -ofp_lex.cc $(srcdir)/fp.lex |
| 76 |
- |
| 77 |
- fp.cc: $(srcdir)/fp.y |
| 78 |
-- $(YACC) --verbose -t -p fp -d -o $@ $< |
| 79 |
-+ $(YACC) --verbose -t -p fp --defines=fp.h -o $@ $< |
| 80 |
- fp.h: fp.cc |
| 81 |
-- mv fp.cc.h $@ 2>/dev/null || mv fp.hh $@ |
| 82 |
-- touch $@ |
| 83 |
- |
| 84 |
- ifeq (@WIN32@,yes) |
| 85 |
- TGTLDFLAGS=-L.. -livl |
| 86 |
-diff --git a/vhdlpp/Makefile.in b/vhdlpp/Makefile.in |
| 87 |
-index 53ae140a..458178bd 100644 |
| 88 |
---- a/vhdlpp/Makefile.in |
| 89 |
-+++ b/vhdlpp/Makefile.in |
| 90 |
-@@ -117,10 +117,8 @@ lexor.cc: $(srcdir)/lexor.lex |
| 91 |
- |
| 92 |
- # Build this in two steps to avoid parallel build issues (see pr3462585) |
| 93 |
- parse.cc: $(srcdir)/parse.y |
| 94 |
-- $(YACC) --verbose -t -d -o $@ $< |
| 95 |
-+ $(YACC) --verbose -t --defines=parse.h -o $@ $< |
| 96 |
- parse.h: parse.cc |
| 97 |
-- mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@ |
| 98 |
-- touch $@ |
| 99 |
- |
| 100 |
- lexor_keyword.o: lexor_keyword.cc parse.h |
| 101 |
- |
| 102 |
-diff --git a/vvp/Makefile.in b/vvp/Makefile.in |
| 103 |
-index 8ccdb1d2..cdd940f5 100644 |
| 104 |
---- a/vvp/Makefile.in |
| 105 |
-+++ b/vvp/Makefile.in |
| 106 |
-@@ -142,10 +142,8 @@ tables.o: tables.cc |
| 107 |
- |
| 108 |
- # Build this in two steps to avoid parallel build issues (see pr3462585) |
| 109 |
- parse.cc: $(srcdir)/parse.y |
| 110 |
-- $(YACC) --verbose -t -d -o $@ $< |
| 111 |
-+ $(YACC) --verbose -t --defines=parse.h -o $@ $< |
| 112 |
- parse.h: parse.cc |
| 113 |
-- mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@ |
| 114 |
-- touch $@ |
| 115 |
- |
| 116 |
- lexor.cc: $(srcdir)/lexor.lex |
| 117 |
- $(LEX) -s -olexor.cc $(srcdir)/lexor.lex |
| 118 |
--- |
| 119 |
-2.26.2 |
| 120 |
- |
Archives