[gentoo-commits] repo/gentoo:master commit in: sci-electronics/iverilog/, sci-electronics/iverilog/files/
commit: 15bc4ddeb0d78cf15632d7d9247532f295943602
Author: Huang Rui gmail com>
AuthorDate: Mon Apr 25 11:04:38 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Apr 27 13:18:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15bc4dde
sci-electronics/iverilog: backport fix compile bug
EAPI: update EAPI 7 -> 8
fix parse.cc fatal error
fix calls nm directly
fix can't find configure.in
fix depend on sys-libs/readline:=
Bug: https://bugs.gentoo.org/721022
Bug: https://bugs.gentoo.org/734760
Bug: https://bugs.gentoo.org/426262
Closes: https://bugs.gentoo.org/731906
Closes: https://bugs.gentoo.org/730096
Signed-off-by: Huang Rui gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25191
Signed-off-by: Joonas Niilola gentoo.org>
.../iverilog/files/iverilog-10.3-call-nm.patch | 67 +++
.../files/iverilog-10.3-configure-ac.patch | 12 +++
.../files/iverilog-10.3-gen-bison-header.patch | 97 ++
.../files/iverilog-10.3-override-var.patch | 12 +++
sci-electronics/iverilog/iverilog-10.3.ebuild | 23 +++--
5 files changed, 202 insertions(+), 9 deletions(-)
diff --git a/sci-electronics/iverilog/files/iverilog-10.3-call-nm.patch
b/sci-electronics/iverilog/files/iverilog-10.3-call-nm.patch
new file mode 100644
index ..2261a6ada4cf
--- /dev/null
+++ b/sci-electronics/iverilog/files/iverilog-10.3-call-nm.patch
@@ -0,0 +1,67 @@
+From f3396d502d408c1b349c378060027905a2c2a9c3 Mon Sep 17 00:00:00 2001
+From: Huang Rui
+Date: Sat, 25 Jul 2020 12:50:49 +0800
+Subject: [PATCH 1/2] aclocal.m4: fix issue in cross-compiling
+
+The aclocal.m4 called nm directly.
+It can cause issue in cross-compiling and because is not possible
+use a different NM implementation (like llvm-nm).
+The compile error log:
+https://bugs.gentoo.org/attachment.cgi?id=648556
+
+Closes: https://bugs.gentoo.org/731906
+Signed-off-by: Huang Rui
+---
+ aclocal.m4 | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index a47eba42c..16ef69c85 100644
+--- a/aclocal.m4
b/aclocal.m4
+@@ -25,9 +25,11 @@ AC_SUBST(install_suffix)
+ # Unwarranted assumptions:
+ # - the object file produced by AC_COMPILE_IFELSE is called
"conftest.$ac_objext"
+ # - the nm(1) utility is available, and its name is "nm".
++# Here use $NM because they can cause issue in cross-compiling and because is
++# not possible use a different NM implementation (like llvm-nm)
+ AC_DEFUN([_AX_C_UNDERSCORES_MATCH_IF],
+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([void underscore(void){}])],
+-[AS_IF([nm conftest.$ac_objext|grep $1 >/dev/null 2>/dev/null],[$2],[$3])],
++[AS_IF([$NM conftest.$ac_objext|grep $1 >/dev/null 2>/dev/null],[$2],[$3])],
+ [AC_MSG_ERROR([underscore test crashed])]
+ )])
+
+
+From d827f674cc0a37d8150c18df6112a0a895f2a584 Mon Sep 17 00:00:00 2001
+From: Huang Rui
+Date: Tue, 28 Jul 2020 21:15:49 +0800
+Subject: [PATCH 2/2] aclocal.m4: fix the comment contradicts the previous line
+
+Changed to "the nm(1) utility or an equivalent is available,
+and its name is defined by the $NM variable.
+
+Signed-off-by: Huang Rui
+---
+ aclocal.m4 | 8
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 16ef69c85..1b2dd6a1e 100644
+--- a/aclocal.m4
b/aclocal.m4
+@@ -23,10 +23,10 @@ AC_SUBST(install_suffix)
+ # --
+ # Sub-macro for AX_C_UNDERSCORES_LEADING and AX_C_UNDERSCORES_TRAILING.
+ # Unwarranted assumptions:
+-# - the object file produced by AC_COMPILE_IFELSE is called
"conftest.$ac_objext"
+-# - the nm(1) utility is available, and its name is "nm".
+-# Here use $NM because they can cause issue in cross-compiling and because is
+-# not possible use a different NM implementation (like llvm-nm)
++# - the object file produced by AC_COMPILE_IFELSE is called
++# "conftest.$ac_objext"
++# - the nm(1) utility or an equivalent is available, and its name
++# is defined by the $NM variable.
+ AC_DEFUN([_AX_C_UNDERSCORES_MATCH_IF],
+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([void underscore(void){}])],
+ [AS_IF([$NM conftest.$ac_objext|grep $1 >/dev/null 2>/dev/null],[$2],[$3])],
diff --git a/sci-electronics/iverilog/files/iverilog-10.3-configure-ac.patch
b/sci-electronics/iverilog/files/iverilog-10.3-configure-ac.patch
new file mode 100644
index ..b7a81d1facaa
--- /dev/null
+++ b/sci-electronics/iverilog/files/iverilog-10.3-configure-ac.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/426262
+--- a/Makefile.in 2022-04-25 18:06:16.529673077 +0800
b/Makefile.in 2022-04-25 18:13:12.134356482 +0800
+@@ -200,7 +200,7 @@
+ ./config.status _pli_types.h
+ _pli_types.h: stamp-_pli_types-h
+
+-$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4
++$(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4
+ cd $(srcdir) && autoconf
+
+ config.status:
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/iverilog/, sci-electronics/iverilog/files/
commit: c993d8bd5997e5003f88fbffdaac2906db963fae
Author: Felix Neumärker posteo de>
AuthorDate: Fri Sep 4 16:50:50 2020 +
Commit: Sam James gentoo org>
CommitDate: Mon Sep 14 18:26:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c993d8bd
sci-electronics/iverilog: fix compile error
Closes: https://bugs.gentoo.org/734760
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Felix Neumärker posteo.de>
Signed-off-by: Sam James gentoo.org>
.../files/iverilog-10.3-gen-bison-header.patch | 97 ++
sci-electronics/iverilog/iverilog-10.3-r2.ebuild | 76 +
2 files changed, 173 insertions(+)
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
new file mode 100644
index 000..0027184c833
--- /dev/null
+++ b/sci-electronics/iverilog/files/iverilog-10.3-gen-bison-header.patch
@@ -0,0 +1,97 @@
+From 5b699c1be73e789831db01e779a41478c0c62309 Mon Sep 17 00:00:00 2001
+From: Henner Zeller
+Date: Wed, 29 Jul 2020 15:29:08 -0700
+Subject: [PATCH] Bison includes its generated header in *.cc. Generate with
+ correct name.
+
+The current bison (3.7) generates a *.cc file that includes the header
+it generated. For parse.cc this would be parse.hh. Right now, we rename
+this header to have a common name used in other files, but this results
+in a compile error for the parse.cc file:
+
+parse.cc:462:10: fatal error: parse.hh: No such file or directory
+ 462 | #include "parse.hh"
+ | ^~
+
+Fix this by telling bison to output the header file to the correct
+filename in the first place so that we don't have to rename it.
+(using the --defines instead of -d option).
+
+This looks like a bison specific option not available in Posix yacc;
+but looks like we're requiring bison anyway.
+
+Signed-off-by: Henner Zeller
+---
+ Makefile.in | 4 +---
+ tgt-pcb/Makefile.in | 4 +---
+ vhdlpp/Makefile.in | 4 +---
+ vvp/Makefile.in | 4 +---
+ 4 files changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5ac5515a..cc8cac46 100644
+--- a/Makefile.in
b/Makefile.in
+@@ -256,10 +256,8 @@ parse.o: parse.cc
+
+ # Build this in two steps to avoid parallel build issues (see pr3462585)
+ parse.cc: $(srcdir)/parse.y
+- $(YACC) --verbose -t -p VL -d -o $@ $<
++ $(YACC) --verbose -t -p VL --defines=parse.h -o $@ $<
+ parse.h: parse.cc
+- mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@
+- touch $@
+
+ syn-rules.cc: $(srcdir)/syn-rules.y
+ $(YACC) --verbose -t -p syn_ -o $@ $<
+diff --git a/tgt-pcb/Makefile.in b/tgt-pcb/Makefile.in
+index a5f9b7d5..7345e195 100644
+--- a/tgt-pcb/Makefile.in
b/tgt-pcb/Makefile.in
+@@ -89,10 +89,8 @@ fp_lex.cc: $(srcdir)/fp.lex
+ $(LEX) -s -ofp_lex.cc $(srcdir)/fp.lex
+
+ fp.cc: $(srcdir)/fp.y
+- $(YACC) --verbose -t -p fp -d -o $@ $<
++ $(YACC) --verbose -t -p fp --defines=fp.h -o $@ $<
+ fp.h: fp.cc
+- mv fp.cc.h $@ 2>/dev/null || mv fp.hh $@
+- touch $@
+
+ ifeq (@WIN32@,yes)
+ TGTLDFLAGS=-L.. -livl
+diff --git a/vhdlpp/Makefile.in b/vhdlpp/Makefile.in
+index 53ae140a..458178bd 100644
+--- a/vhdlpp/Makefile.in
b/vhdlpp/Makefile.in
+@@ -117,10 +117,8 @@ lexor.cc: $(srcdir)/lexor.lex
+
+ # Build this in two steps to avoid parallel build issues (see pr3462585)
+ parse.cc: $(srcdir)/parse.y
+- $(YACC) --verbose -t -d -o $@ $<
++ $(YACC) --verbose -t --defines=parse.h -o $@ $<
+ parse.h: parse.cc
+- mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@
+- touch $@
+
+ lexor_keyword.o: lexor_keyword.cc parse.h
+
+diff --git a/vvp/Makefile.in b/vvp/Makefile.in
+index 8ccdb1d2..cdd940f5 100644
+--- a/vvp/Makefile.in
b/vvp/Makefile.in
+@@ -142,10 +142,8 @@ tables.o: tables.cc
+
+ # Build this in two steps to avoid parallel build issues (see pr3462585)
+ parse.cc: $(srcdir)/parse.y
+- $(YACC) --verbose -t -d -o $@ $<
++ $(YACC) --verbose -t --defines=parse.h -o $@ $<
+ parse.h: parse.cc
+- mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@
+- touch $@
+
+ lexor.cc: $(srcdir)/lexor.lex
+ $(LEX) -s -olexor.cc $(srcdir)/lexor.lex
+--
+2.26.2
+
diff --git a/sci-electronics/iverilog/iverilog-10.3-r2.ebuild
b/sci-electronics/iverilog/iverilog-10.3-r2.ebuild
new file mode 100644
index 000..dcce51a4502
--- /dev/null
+++ b/sci-electronics/iverilog/iverilog-10.3-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+GITHUB_PV=$(ver_rs 1- '_')
+
+DESCRIPTION="A Verilog simulation and synthesis tool"
+HOMEPAGE="
+ http://iverilog.icarus.com
+ https://github.com/steveicarus/iverilog
+"
+
+if [[ ${PV} == "" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git;
+else
+
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/iverilog/, sci-electronics/iverilog/files/
commit: 1b11d304e51f599f02cda5a20b01cd3b67bc37c9 Author: Huang Rui gmail com> AuthorDate: Sat Feb 29 17:59:36 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Mar 8 12:57:57 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b11d304 sci-electronics/iverilog: fix build problem in iverilog-.ebuild Removed unused patch because it merged into upstream https://github.com/steveicarus/iverilog/pull/300 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Huang Rui gmail.com> Closes: https://github.com/gentoo/gentoo/pull/14809 Signed-off-by: Joonas Niilola gentoo.org> .../files/iverilog--file-missing.patch | 644 - sci-electronics/iverilog/iverilog-.ebuild | 4 - 2 files changed, 648 deletions(-) diff --git a/sci-electronics/iverilog/files/iverilog--file-missing.patch b/sci-electronics/iverilog/files/iverilog--file-missing.patch deleted file mode 100644 index a8d809cef8e..000 --- a/sci-electronics/iverilog/files/iverilog--file-missing.patch +++ /dev/null @@ -1,644 +0,0 @@ -https://bugs.gentoo.org/705412 a/Makefile.in -+++ b/Makefile.in -@@ -308,67 +308,62 @@ version_tag.h version: - - ifeq (@MINGW32@,yes) - ifeq ($(MAN),none) --INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1 -+INSTALL_DOC = installman - else - ifeq ($(PS2PDF),none) --INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1 -+INSTALL_DOC = installman - else --INSTALL_DOC = $(prefix)/iverilog-vpi$(suffix).pdf $(mandir)/man1/iverilog-vpi$(suffix).1 -+INSTALL_DOC = installpdf installman - all: dep iverilog-vpi.pdf - endif - endif - INSTALL_DOCDIR = $(mandir)/man1 - else --INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1 -+INSTALL_DOC = installman - INSTALL_DOCDIR = $(mandir)/man1 - endif - - ifeq (@MINGW32@,yes) - WIN32_INSTALL = - else --WIN32_INSTALL = $(bindir)/iverilog-vpi$(suffix) -+WIN32_INSTALL = installwin32 - endif - --install: all installdirs $(libdir)/ivl$(suffix)/ivl@EXEEXT@ $(libdir)/ivl$(suffix)/include/constants.vams $(libdir)/ivl$(suffix)/include/disciplines.vams $(includedir)/ivl_target.h $(includedir)/_pli_types.h $(includedir)/sv_vpi_user.h $(includedir)/vpi_user.h $(includedir)/acc_user.h $(includedir)/veriuser.h $(WIN32_INSTALL) $(INSTALL_DOC) -+install: all installdirs installfiles - $(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true - --$(bindir)/iverilog-vpi$(suffix): ./iverilog-vpi installdirs -+F = ./ivl@EXEEXT@ \ -+ $(srcdir)/constants.vams \ -+ $(srcdir)/disciplines.vams \ -+ $(srcdir)/ivl_target.h \ -+ ./_pli_types.h \ -+ $(srcdir)/sv_vpi_user.h \ -+ $(srcdir)/vpi_user.h \ -+ $(srcdir)/acc_user.h \ -+ $(srcdir)/veriuser.h \ -+ $(INSTALL_DOC) \ -+ $(WIN32_INSTALL) -+ -+installwin32: ./iverilog-vpi installdirs - $(INSTALL_SCRIPT) ./iverilog-vpi "$(DESTDIR)$(bindir)/iverilog-vpi$(suffix)" - --$(libdir)/ivl$(suffix)/ivl@EXEEXT@: ./ivl@EXEEXT@ installdirs -- $(INSTALL_PROGRAM) ./ivl@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@" -+installman: iverilog-vpi.man installdirs -+ $(INSTALL_DATA) iverilog-vpi.man "$(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1" - --$(libdir)/ivl$(suffix)/include/constants.vams: $(srcdir)/constants.vams installdirs -- $(INSTALL_DATA) $(srcdir)/constants.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/constants.vams" -+installpdf: iverilog-vpi.pdf installdirs -+ $(INSTALL_DATA) iverilog-vpi.pdf "$(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf" - --$(libdir)/ivl$(suffix)/include/disciplines.vams: $(srcdir)/disciplines.vams installdirs -+installfiles: $(F) installdirs -+ $(INSTALL_PROGRAM) ./ivl@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@" -+ $(INSTALL_DATA) $(srcdir)/constants.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/constants.vams" - $(INSTALL_DATA) $(srcdir)/disciplines.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/disciplines.vams" -- --$(includedir)/ivl_target.h: $(srcdir)/ivl_target.h installdirs - $(INSTALL_DATA) $(srcdir)/ivl_target.h "$(DESTDIR)$(includedir)/ivl_target.h" -- --$(includedir)/_pli_types.h: _pli_types.h installdirs -- $(INSTALL_DATA) $< "$(DESTDIR)$(includedir)/_pli_types.h" -- --$(includedir)/sv_vpi_user.h: $(srcdir)/sv_vpi_user.h installdirs -+ $(INSTALL_DATA) ./_pli_types.h "$(DESTDIR)$(includedir)/_pli_types.h" - $(INSTALL_DATA) $(srcdir)/sv_vpi_user.h "$(DESTDIR)$(includedir)/sv_vpi_user.h" -- --$(includedir)/vpi_user.h: $(srcdir)/vpi_user.h installdirs - $(INSTALL_DATA) $(srcdir)/vpi_user.h "$(DESTDIR)$(includedir)/vpi_user.h" -- --$(includedir)/acc_user.h: $(srcdir)/acc_user.h installdirs - $(INSTALL_DATA) $(srcdir)/acc_user.h "$(DESTDIR)$(includedir)/acc_user.h" -- --$(includedir)/veriuser.h: $(srcdir)/veriuser.h installdirs - $(INSTALL_DATA) $(srcdir)/veriuser.h "$(DESTDIR)$(includedir)/veriuser.h" -
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/iverilog/, sci-electronics/iverilog/files/
commit: 4202315a5c0a34f3ce0be67ef3216efbae1c6532
Author: Huang Rui gmail com>
AuthorDate: Thu Jan 30 07:32:15 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Feb 17 07:23:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4202315a
sci-electronics/iverilog: fix 10.3 gcc-10 build problem
gcc-10 and above flipped a default from -fcommon to -fno-common:
https://gcc.gnu.org/PR85678
Usually all it takes is to add a few 'extern' declarations and
move definitions from header files to modules. I've port iverilog
to gcc-10.
Closes: https://bugs.gentoo.org/706366
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Huang Rui gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14619
Signed-off-by: Sergei Trofimovich gentoo.org>
.../iverilog/files/iverilog-10.3-fno-common.patch | 33 ++
sci-electronics/iverilog/iverilog-10.3.ebuild | 1 +
2 files changed, 34 insertions(+)
diff --git a/sci-electronics/iverilog/files/iverilog-10.3-fno-common.patch
b/sci-electronics/iverilog/files/iverilog-10.3-fno-common.patch
new file mode 100644
index 000..3bb06c6db42
--- /dev/null
+++ b/sci-electronics/iverilog/files/iverilog-10.3-fno-common.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/706366
+--- a/driver/cflexor.lex
b/driver/cflexor.lex
+@@ -27,6 +27,8 @@
+ # include "globals.h"
+ # include
+
++char *current_file = NULL;
++
+ static int comment_enter;
+ static char* trim_trailing_white(char*txt, int trim);
+
+--- a/driver/cfparse_misc.h
b/driver/cfparse_misc.h
+@@ -39,6 +39,6 @@ int cferror(const char *);
+ int cfparse(void);
+ void switch_to_command_file(const char *);
+ void destroy_lexor(void);
+-char *current_file;
++extern char *current_file;
+
+ #endif /* IVL_cfparse_misc_H */
+--- a/libveriuser/priv.h
b/libveriuser/priv.h
+@@ -31,6 +31,6 @@ extern char* __acc_newstring(const char*txt);
+ /*
+ * Trace file for logging ACC and TF calls.
+ */
+-FILE* pli_trace;
++extern FILE* pli_trace;
+
+ #endif /* IVL_priv_H */
+
diff --git a/sci-electronics/iverilog/iverilog-10.3.ebuild
b/sci-electronics/iverilog/iverilog-10.3.ebuild
index ae61d822ad4..b5e65f56c2e 100644
--- a/sci-electronics/iverilog/iverilog-10.3.ebuild
+++ b/sci-electronics/iverilog/iverilog-10.3.ebuild
@@ -40,6 +40,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-10.3-file-missing.patch #705412
+ "${FILESDIR}"/${PN}-10.3-fno-common.patch #706366
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/iverilog/, sci-electronics/iverilog/files/
commit: 908a3f9275cf222ded28dfcb0347c6e81f330c61 Author: Huang Rui gmail com> AuthorDate: Wed Jan 29 16:27:20 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Jan 30 06:33:06 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=908a3f92 sci-electronics/iverilog: fix install bug of The upstream's Makefile used a very unusual installation method. It may cause overwrite installation bug. Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Huang Rui gmail.com> Closes: https://github.com/gentoo/gentoo/pull/14375 Signed-off-by: Joonas Niilola gentoo.org> .../files/iverilog--file-missing.patch | 644 + sci-electronics/iverilog/iverilog-.ebuild | 4 + 2 files changed, 648 insertions(+) diff --git a/sci-electronics/iverilog/files/iverilog--file-missing.patch b/sci-electronics/iverilog/files/iverilog--file-missing.patch new file mode 100644 index 000..a8d809cef8e --- /dev/null +++ b/sci-electronics/iverilog/files/iverilog--file-missing.patch @@ -0,0 +1,644 @@ +https://bugs.gentoo.org/705412 +--- a/Makefile.in b/Makefile.in +@@ -308,67 +308,62 @@ version_tag.h version: + + ifeq (@MINGW32@,yes) + ifeq ($(MAN),none) +-INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1 ++INSTALL_DOC = installman + else + ifeq ($(PS2PDF),none) +-INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1 ++INSTALL_DOC = installman + else +-INSTALL_DOC = $(prefix)/iverilog-vpi$(suffix).pdf $(mandir)/man1/iverilog-vpi$(suffix).1 ++INSTALL_DOC = installpdf installman + all: dep iverilog-vpi.pdf + endif + endif + INSTALL_DOCDIR = $(mandir)/man1 + else +-INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1 ++INSTALL_DOC = installman + INSTALL_DOCDIR = $(mandir)/man1 + endif + + ifeq (@MINGW32@,yes) + WIN32_INSTALL = + else +-WIN32_INSTALL = $(bindir)/iverilog-vpi$(suffix) ++WIN32_INSTALL = installwin32 + endif + +-install: all installdirs $(libdir)/ivl$(suffix)/ivl@EXEEXT@ $(libdir)/ivl$(suffix)/include/constants.vams $(libdir)/ivl$(suffix)/include/disciplines.vams $(includedir)/ivl_target.h $(includedir)/_pli_types.h $(includedir)/sv_vpi_user.h $(includedir)/vpi_user.h $(includedir)/acc_user.h $(includedir)/veriuser.h $(WIN32_INSTALL) $(INSTALL_DOC) ++install: all installdirs installfiles + $(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true + +-$(bindir)/iverilog-vpi$(suffix): ./iverilog-vpi installdirs ++F = ./ivl@EXEEXT@ \ ++ $(srcdir)/constants.vams \ ++ $(srcdir)/disciplines.vams \ ++ $(srcdir)/ivl_target.h \ ++ ./_pli_types.h \ ++ $(srcdir)/sv_vpi_user.h \ ++ $(srcdir)/vpi_user.h \ ++ $(srcdir)/acc_user.h \ ++ $(srcdir)/veriuser.h \ ++ $(INSTALL_DOC) \ ++ $(WIN32_INSTALL) ++ ++installwin32: ./iverilog-vpi installdirs + $(INSTALL_SCRIPT) ./iverilog-vpi "$(DESTDIR)$(bindir)/iverilog-vpi$(suffix)" + +-$(libdir)/ivl$(suffix)/ivl@EXEEXT@: ./ivl@EXEEXT@ installdirs +- $(INSTALL_PROGRAM) ./ivl@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@" ++installman: iverilog-vpi.man installdirs ++ $(INSTALL_DATA) iverilog-vpi.man "$(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1" + +-$(libdir)/ivl$(suffix)/include/constants.vams: $(srcdir)/constants.vams installdirs +- $(INSTALL_DATA) $(srcdir)/constants.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/constants.vams" ++installpdf: iverilog-vpi.pdf installdirs ++ $(INSTALL_DATA) iverilog-vpi.pdf "$(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf" + +-$(libdir)/ivl$(suffix)/include/disciplines.vams: $(srcdir)/disciplines.vams installdirs ++installfiles: $(F) installdirs ++ $(INSTALL_PROGRAM) ./ivl@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@" ++ $(INSTALL_DATA) $(srcdir)/constants.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/constants.vams" + $(INSTALL_DATA) $(srcdir)/disciplines.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/disciplines.vams" +- +-$(includedir)/ivl_target.h: $(srcdir)/ivl_target.h installdirs + $(INSTALL_DATA) $(srcdir)/ivl_target.h "$(DESTDIR)$(includedir)/ivl_target.h" +- +-$(includedir)/_pli_types.h: _pli_types.h installdirs +- $(INSTALL_DATA) $< "$(DESTDIR)$(includedir)/_pli_types.h" +- +-$(includedir)/sv_vpi_user.h: $(srcdir)/sv_vpi_user.h installdirs ++ $(INSTALL_DATA) ./_pli_types.h "$(DESTDIR)$(includedir)/_pli_types.h" + $(INSTALL_DATA) $(srcdir)/sv_vpi_user.h "$(DESTDIR)$(includedir)/sv_vpi_user.h" +- +-$(includedir)/vpi_user.h: $(srcdir)/vpi_user.h installdirs + $(INSTALL_DATA) $(srcdir)/vpi_user.h "$(DESTDIR)$(includedir)/vpi_user.h" +- +-$(includedir)/acc_user.h: $(srcdir)/acc_user.h installdirs + $(INSTALL_DATA) $(srcdir)/acc_user.h "$(DESTDIR)$(includedir)/acc_user.h" +- +-$(includedir)/veriuser.h: $(srcdir)/veriuser.h installdirs + $(INSTALL_DATA) $(srcdir)/veriuser.h "$(DESTDIR)$(includedir)/veriuser.h" + +-$(mandir)/man1/iverilog-vpi$(suffix).1:
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/iverilog/, sci-electronics/iverilog/files/
commit: 560664303060100467ca053a94decb296da113d8 Author: Huang Rui gmail com> AuthorDate: Wed Jan 29 16:23:37 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Jan 30 06:33:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56066430 sci-electronics/iverilog: fix install bug of 10.3 The upstream's Makefile used a very unusual installation method. It may cause overwrite installation bug. Closes: https://bugs.gentoo.org/705412 Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Huang Rui gmail.com> Signed-off-by: Joonas Niilola gentoo.org> .../files/iverilog-10.3-file-missing.patch | 191 + sci-electronics/iverilog/iverilog-10.3.ebuild | 4 + 2 files changed, 195 insertions(+) diff --git a/sci-electronics/iverilog/files/iverilog-10.3-file-missing.patch b/sci-electronics/iverilog/files/iverilog-10.3-file-missing.patch new file mode 100644 index 000..2232fff2296 --- /dev/null +++ b/sci-electronics/iverilog/files/iverilog-10.3-file-missing.patch @@ -0,0 +1,191 @@ +https://bugs.gentoo.org/705412 +--- a/Makefile.in b/Makefile.in +@@ -327,6 +327,7 @@ else + WIN32_INSTALL = $(bindir)/iverilog-vpi$(suffix) + endif + ++.PHONY: all installdirs $(libdir)/ivl$(suffix)/ivl@EXEEXT@ $(libdir)/ivl$(suffix)/include/constants.vams $(libdir)/ivl$(suffix)/include/disciplines.vams $(includedir)/ivl_target.h $(includedir)/_pli_types.h $(includedir)/sv_vpi_user.h $(includedir)/vpi_user.h $(includedir)/acc_user.h $(includedir)/veriuser.h $(WIN32_INSTALL) $(INSTALL_DOC) + install: all installdirs $(libdir)/ivl$(suffix)/ivl@EXEEXT@ $(libdir)/ivl$(suffix)/include/constants.vams $(libdir)/ivl$(suffix)/include/disciplines.vams $(includedir)/ivl_target.h $(includedir)/_pli_types.h $(includedir)/sv_vpi_user.h $(includedir)/vpi_user.h $(includedir)/acc_user.h $(includedir)/veriuser.h $(WIN32_INSTALL) $(INSTALL_DOC) + $(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true + +--- a/cadpli/Makefile.in b/cadpli/Makefile.in +@@ -79,6 +79,7 @@ endif + cadpli.vpl: $O ../vvp/libvpi.a ../libveriuser/libveriuser.o + $(CC) @shared@ $(LDFLAGS) -o $@ $O ../libveriuser/libveriuser.o $(SYSTEM_VPI_LDFLAGS) + ++.PHONY: all installdirs $(vpidir)/cadpli.vpl + install: all installdirs $(vpidir)/cadpli.vpl + + $(vpidir)/cadpli.vpl: ./cadpli.vpl +--- a/driver-vpi/Makefile.in b/driver-vpi/Makefile.in +@@ -93,6 +93,7 @@ res.o: res.rc + $(WINDRES) -i res.rc -o res.o + # + ++.PHONY: all installdirs $(bindir)/iverilog-vpi$(suffix)@EXEEXT@ + install: all installdirs $(bindir)/iverilog-vpi$(suffix)@EXEEXT@ + + $(bindir)/iverilog-vpi$(suffix)@EXEEXT@: ./iverilog-vpi@EXEEXT@ +--- a/driver/Makefile.in b/driver/Makefile.in +@@ -127,6 +127,7 @@ INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1 + INSTALL_DOCDIR = $(mandir)/man1 + endif + ++.PHONY: all installdirs $(bindir)/iverilog$(suffix)@EXEEXT@ $(INSTALL_DOC) + install: all installdirs $(bindir)/iverilog$(suffix)@EXEEXT@ $(INSTALL_DOC) + + $(bindir)/iverilog$(suffix)@EXEEXT@: ./iverilog@EXEEXT@ +--- a/ivlpp/Makefile.in b/ivlpp/Makefile.in +@@ -71,6 +71,7 @@ ivlpp@EXEEXT@: $O + lexor.c: $(srcdir)/lexor.lex + $(LEX) -t $< > $@ + ++.PHONY: all installdirs $(libdir)/ivl$(suffix)/ivlpp@EXEEXT@ + install: all installdirs $(libdir)/ivl$(suffix)/ivlpp@EXEEXT@ + + $(libdir)/ivl$(suffix)/ivlpp@EXEEXT@: ivlpp@EXEEXT@ +--- a/tgt-blif/Makefile.in b/tgt-blif/Makefile.in +@@ -81,6 +81,7 @@ endif + blif.tgt: $O $(TGTDEPLIBS) + $(CXX) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS) + ++.PHONY: all installdirs $(libdir)/ivl$(suffix)/blif.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/blif.conf $(libdir)/ivl$(suffix)/blif-s.conf + install: all installdirs $(libdir)/ivl$(suffix)/blif.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/blif.conf $(libdir)/ivl$(suffix)/blif-s.conf + + $(libdir)/ivl$(suffix)/blif.tgt: ./blif.tgt +--- a/tgt-fpga/Makefile.in b/tgt-fpga/Makefile.in +@@ -100,6 +100,7 @@ INSTALL_DOC = $(mandir)/man1/iverilog-fpga$(suffix).1 + INSTALL_DOCDIR = $(mandir)/man1 + endif + ++.PHONY: all installdirs $(libdir)/ivl$(suffix)/fpga.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/fpga.conf $(libdir)/ivl$(suffix)/fpga-s.conf + install: all installdirs $(libdir)/ivl$(suffix)/fpga.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/fpga.conf $(libdir)/ivl$(suffix)/fpga-s.conf + + $(libdir)/ivl$(suffix)/fpga.tgt: ./fpga.tgt +--- a/tgt-null/Makefile.in b/tgt-null/Makefile.in +@@ -80,6 +80,7 @@ endif + null.tgt: $O $(TGTDEPLIBS) + $(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS) + ++.PHONY: all installdirs $(libdir)/ivl$(suffix)/null.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/null.conf $(libdir)/ivl$(suffix)/null-s.conf + install: all installdirs $(libdir)/ivl$(suffix)/null.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/null.conf $(libdir)/ivl$(suffix)/null-s.conf + + $(libdir)/ivl$(suffix)/null.tgt: ./null.tgt +--- a/tgt-pal/Makefile.in
