[gentoo-commits] repo/gentoo:master commit in: sci-electronics/iverilog/, sci-electronics/iverilog/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/iverilog/, sci-electronics/iverilog/files/
@ 2020-01-30  6:33 Joonas Niilola
  0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-01-30  6:33 UTC (permalink / raw
  To: gentoo-commits

commit:     908a3f9275cf222ded28dfcb0347c6e81f330c61
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Wed Jan 29 16:27:20 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 06:33:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=908a3f92

sci-electronics/iverilog: fix install bug of 9999

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 <vowstar <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14375
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/iverilog-9999-file-missing.patch         | 644 +++++++++++++++++++++
 sci-electronics/iverilog/iverilog-9999.ebuild      |   4 +
 2 files changed, 648 insertions(+)

diff --git a/sci-electronics/iverilog/files/iverilog-9999-file-missing.patch b/sci-electronics/iverilog/files/iverilog-9999-file-missing.patch
new file mode 100644
index 00000000000..a8d809cef8e
--- /dev/null
+++ b/sci-electronics/iverilog/files/iverilog-9999-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: iverilog-vpi.man installdirs
+-	$(INSTALL_DATA) iverilog-vpi.man "$(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1"
+-
+-$(prefix)/iverilog-vpi$(suffix).pdf: iverilog-vpi.pdf installdirs
+-	$(INSTALL_DATA) iverilog-vpi.pdf "$(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf"
+-
+-
+ installdirs: $(srcdir)/mkinstalldirs
+ 	$(srcdir)/mkinstalldirs "$(DESTDIR)$(bindir)" \
+ 	    "$(DESTDIR)$(includedir)" \
+--- a/cadpli/Makefile.in
++++ b/cadpli/Makefile.in
+@@ -79,9 +79,11 @@ endif
+ cadpli.vpl: $O ../vpi/libvpi.a ../libveriuser/libveriuser.o
+ 	$(CC) @shared@ $(LDFLAGS) -o $@ $O ../libveriuser/libveriuser.o $(SYSTEM_VPI_LDFLAGS)
+ 
+-install: all installdirs $(vpidir)/cadpli.vpl
++install: all installdirs installfiles
+ 
+-$(vpidir)/cadpli.vpl: ./cadpli.vpl
++F = ./cadpli.vpl
++
++installfiles: $(F) installdirs
+ 	$(INSTALL_PROGRAM) ./cadpli.vpl "$(DESTDIR)$(vpidir)/cadpli.vpl"
+ 
+ installdirs: $(srcdir)/../mkinstalldirs
+--- a/driver-vpi/Makefile.in
++++ b/driver-vpi/Makefile.in
+@@ -94,9 +94,11 @@ res.o: res.rc
+ 	$(WINDRES) -i res.rc -o res.o
+ #
+ 
+-install: all installdirs $(bindir)/iverilog-vpi$(suffix)@EXEEXT@
++install: all installdirs installfiles
+ 
+-$(bindir)/iverilog-vpi$(suffix)@EXEEXT@: ./iverilog-vpi@EXEEXT@
++F = ./iverilog-vpi@EXEEXT@
++
++installfiles: $(F) installdirs
+ 	$(INSTALL_PROGRAM) ./iverilog-vpi@EXEEXT@ "$(bindir)/iverilog-vpi$(suffix)@EXEEXT@"
+ ifeq (@WIN32@,yes)
+ ifneq ($(HOSTCC),$(CC))
+--- a/driver/Makefile.in
++++ b/driver/Makefile.in
+@@ -112,32 +112,35 @@ iverilog.pdf: iverilog.ps
+ 
+ ifeq (@MINGW32@,yes)
+ ifeq ($(MAN),none)
+-INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1
++INSTALL_DOC = installman
+ else
+ ifeq ($(PS2PDF),none)
+-INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1
++INSTALL_DOC = installman
+ else
+-INSTALL_DOC = $(prefix)/iverilog$(suffix).pdf $(mandir)/man1/iverilog$(suffix).1
++INSTALL_DOC = installpdf installman
+ all: iverilog.pdf
+ endif
+ endif
+ INSTALL_DOCDIR = $(mandir)/man1
+ else
+-INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1
++INSTALL_DOC = installman
+ INSTALL_DOCDIR = $(mandir)/man1
+ endif
+ 
+-install: all installdirs $(bindir)/iverilog$(suffix)@EXEEXT@ $(INSTALL_DOC)
++install: all installdirs installfiles
+ 
+-$(bindir)/iverilog$(suffix)@EXEEXT@: ./iverilog@EXEEXT@
+-	$(INSTALL_PROGRAM) ./iverilog@EXEEXT@ "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@"
++F = ./iverilog@EXEEXT@ \
++	$(INSTALL_DOC)
+ 
+-$(mandir)/man1/iverilog$(suffix).1: iverilog.man
++installman: iverilog.man installdirs
+ 	$(INSTALL_DATA) iverilog.man "$(DESTDIR)$(mandir)/man1/iverilog$(suffix).1"
+ 
+-$(prefix)/iverilog$(suffix).pdf: iverilog.pdf
++installpdf: iverilog.pdf installdirs
+ 	$(INSTALL_DATA) iverilog.pdf "$(DESTDIR)$(prefix)/iverilog$(suffix).pdf"
+ 
++installfiles: $(F) installdirs
++	$(INSTALL_PROGRAM) ./iverilog@EXEEXT@ "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@"
++
+ installdirs: $(srcdir)/../mkinstalldirs
+ 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(INSTALL_DOCDIR)"
+ 
+--- a/ivlpp/Makefile.in
++++ b/ivlpp/Makefile.in
+@@ -71,9 +71,11 @@ ivlpp@EXEEXT@: $O
+ lexor.c: $(srcdir)/lexor.lex
+ 	$(LEX) -t $< > $@
+ 
+-install: all installdirs $(libdir)/ivl$(suffix)/ivlpp@EXEEXT@
++install: all installdirs installfiles
+ 
+-$(libdir)/ivl$(suffix)/ivlpp@EXEEXT@: ivlpp@EXEEXT@
++F = ivlpp@EXEEXT@
++
++installfiles: $(F) installdirs
+ 	$(INSTALL_PROGRAM) ./ivlpp@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivlpp@EXEEXT@"
+ 
+ installdirs: $(srcdir)/../mkinstalldirs
+--- a/libveriuser/Makefile.in
++++ b/libveriuser/Makefile.in
+@@ -103,9 +103,11 @@ libveriuser.a: libveriuser.o
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
+ 	mv $*.d dep
+ 
+-install:: all installdirs $(libdir)/libveriuser$(suffix).a $(INSTALL32)
++install:: all installdirs installfiles
+ 
+-$(libdir)/libveriuser$(suffix).a: ./libveriuser.a
++F = ./libveriuser.a
++
++installfiles: $(F) installdirs
+ 	$(INSTALL_DATA) ./libveriuser.a "$(DESTDIR)$(libdir)/libveriuser$(suffix).a"
+ 
+ installdirs: $(srcdir)/../mkinstalldirs
+--- a/tgt-blif/Makefile.in
++++ b/tgt-blif/Makefile.in
+@@ -83,18 +83,17 @@ endif
+ blif.tgt: $O $(TGTDEPLIBS)
+ 	$(CXX) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
+ 
+-install: all installdirs $(libdir)/ivl$(suffix)/blif.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/blif.conf $(libdir)/ivl$(suffix)/blif-s.conf
++install: all installdirs installfiles
+ 
+-$(libdir)/ivl$(suffix)/blif.tgt: ./blif.tgt
+-	$(INSTALL_PROGRAM) ./blif.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/blif.tgt"
++F = ./blif.tgt \
++	$(srcdir)/blif.conf \
++	$(srcdir)/blif-s.conf
+ 
+-$(libdir)/ivl$(suffix)/blif.conf: $(srcdir)/blif.conf
++installfiles: $(F) installdirs
++	$(INSTALL_PROGRAM) ./blif.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/blif.tgt"
+ 	$(INSTALL_DATA) $(srcdir)/blif.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/blif.conf"
+-
+-$(libdir)/ivl$(suffix)/blif-s.conf: $(srcdir)/blif-s.conf
+ 	$(INSTALL_DATA) $(srcdir)/blif-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/blif-s.conf"
+ 
+-
+ installdirs: $(srcdir)/../mkinstalldirs
+ 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)"
+ 
+--- a/tgt-fpga/Makefile.in
++++ b/tgt-fpga/Makefile.in
+@@ -93,38 +93,38 @@ iverilog-fpga.pdf: iverilog-fpga.ps
+ 	ps2pdf iverilog-fpga.ps iverilog-fpga.pdf
+ 
+ ifeq (@WIN32@,yes)
+-INSTALL_DOC = $(prefix)/iverilog-fpga$(suffix).pdf $(mandir)/man1/iverilog-fpga$(suffix).1
++INSTALL_DOC = installpdf installman
+ INSTALL_DOCDIR = $(mandir)/man1
+ all: iverilog-fpga.pdf
+ else
+-INSTALL_DOC = $(mandir)/man1/iverilog-fpga$(suffix).1
++INSTALL_DOC = installman
+ INSTALL_DOCDIR = $(mandir)/man1
+ endif
+ 
+-install: all installdirs $(libdir)/ivl$(suffix)/fpga.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/fpga.conf $(libdir)/ivl$(suffix)/fpga-s.conf
++install: all installdirs installfiles
+ 
+-$(libdir)/ivl$(suffix)/fpga.tgt: ./fpga.tgt
+-	$(INSTALL_PROGRAM) ./fpga.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.tgt"
+-
+-$(libdir)/ivl$(suffix)/fpga.conf: $(srcdir)/fpga.conf
+-	$(INSTALL_DATA) $(srcdir)/fpga.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.conf"
+-
+-$(libdir)/ivl$(suffix)/fpga-s.conf: $(srcdir)/fpga-s.conf
+-	$(INSTALL_DATA) $(srcdir)/fpga-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga-s.conf"
++F = ./fpga.tgt \
++	$(srcdir)/fpga.conf \
++	$(srcdir)/fpga-s.conf \
++	$(INSTALL_DOC)
+ 
+-
+-$(mandir)/man1/iverilog-fpga$(suffix).1: $(srcdir)/iverilog-fpga.man
++installman: $(srcdir)/iverilog-fpga.man installdirs
+ 	$(INSTALL_DATA) $(srcdir)/iverilog-fpga.man "$(DESTDIR)$(mandir)/man1/iverilog-fpga$(suffix).1"
+ 
+-$(prefix)/iverilog-fpga$(suffix).pdf: iverilog-fpga.pdf
++installpdf: iverilog-fpga.pdf installdirs
+ 	$(INSTALL_DATA) iverilog-fpga.pdf "$(DESTDIR)$(prefix)/iverilog-fpga$(suffix).pdf"
+ 
++installfiles: $(F) installdirs
++	$(INSTALL_PROGRAM) ./fpga.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.tgt"
++	$(INSTALL_DATA) $(srcdir)/fpga.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.conf"
++	$(INSTALL_DATA) $(srcdir)/fpga-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga-s.conf"
++
+ installdirs: $(srcdir)/../mkinstalldirs
+-	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)"
++	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)" "$(DESTDIR)$(INSTALL_DOCDIR)"
+ 
+ uninstall:
+ 	rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.tgt"
+-	rm -f "$(DESTDIR)$(INSTALL_DOC)"
++	rm -f "$(DESTDIR)$(prefix)/iverilog-fpga$(suffix).pdf" "$(DESTDIR)$(mandir)/man1/iverilog-fpga$(suffix).1"
+ 	rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga-s.conf"
+ 	rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.conf"
+ 
+--- a/tgt-null/Makefile.in
++++ b/tgt-null/Makefile.in
+@@ -81,18 +81,17 @@ endif
+ null.tgt: $O $(TGTDEPLIBS)
+ 	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
+ 
+-install: all installdirs $(libdir)/ivl$(suffix)/null.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/null.conf $(libdir)/ivl$(suffix)/null-s.conf
++install: all installdirs installfiles
+ 
+-$(libdir)/ivl$(suffix)/null.tgt: ./null.tgt
+-	$(INSTALL_PROGRAM) ./null.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/null.tgt"
++F = ./null.tgt \
++	$(srcdir)/null.conf \
++	$(srcdir)/null-s.conf
+ 
+-$(libdir)/ivl$(suffix)/null.conf: $(srcdir)/null.conf
++installfiles: $(F) installdirs
++	$(INSTALL_PROGRAM) ./null.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/null.tgt"
+ 	$(INSTALL_DATA) $(srcdir)/null.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/null.conf"
+-
+-$(libdir)/ivl$(suffix)/null-s.conf: $(srcdir)/null-s.conf
+ 	$(INSTALL_DATA) $(srcdir)/null-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/null-s.conf"
+ 
+-
+ installdirs: $(srcdir)/../mkinstalldirs
+ 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)"
+ 
+--- a/tgt-pal/Makefile.in
++++ b/tgt-pal/Makefile.in
+@@ -80,11 +80,12 @@ endif
+ pal.tgt: $O $(TGTDEPLIBS)
+ 	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS) -lipal
+ 
+-install: all installdirs $(libdir)/ivl/pal.tgt
++install: all installdirs installfiles
+ 
+-$(libdir)/ivl/pal.tgt: ./pal.tgt
+-	$(INSTALL_PROGRAM) ./pal.tgt "$(DESTDIR)$(libdir)/ivl/pal.tgt"
++F = ./pal.tgt
+ 
++installfiles: $(F) installdirs
++	$(INSTALL_PROGRAM) ./pal.tgt "$(DESTDIR)$(libdir)/ivl/pal.tgt"
+ 
+ installdirs: $(srcdir)/../mkinstalldirs
+ 	$(srcdir)/../mkinstalldirs "$(DESTDIR)/$(libdir)/ivl"
+--- a/tgt-pcb/Makefile.in
++++ b/tgt-pcb/Makefile.in
+@@ -105,18 +105,17 @@ endif
+ pcb.tgt: $O $(TGTDEPLIBS)
+ 	$(CXX) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
+ 
+-install: all installdirs $(libdir)/ivl$(suffix)/pcb.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/pcb.conf $(libdir)/ivl$(suffix)/pcb-s.conf
++install: all installdirs installfiles
+ 
+-$(libdir)/ivl$(suffix)/pcb.tgt: ./pcb.tgt
+-	$(INSTALL_PROGRAM) ./pcb.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/pcb.tgt"
++F = ./pcb.tgt \
++	$(srcdir)/pcb.conf \
++	$(srcdir)/pcb-s.conf
+ 
+-$(libdir)/ivl$(suffix)/pcb.conf: $(srcdir)/pcb.conf
++installfiles: $(F) installdirs
++	$(INSTALL_PROGRAM) ./pcb.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/pcb.tgt"
+ 	$(INSTALL_DATA) $(srcdir)/pcb.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/pcb.conf"
+-
+-$(libdir)/ivl$(suffix)/pcb-s.conf: $(srcdir)/pcb-s.conf
+ 	$(INSTALL_DATA) $(srcdir)/pcb-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/pcb-s.conf"
+ 
+-
+ installdirs: $(srcdir)/../mkinstalldirs
+ 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)"
+ 
+--- a/tgt-sizer/Makefile.in
++++ b/tgt-sizer/Makefile.in
+@@ -81,18 +81,17 @@ endif
+ sizer.tgt: $O $(TGTDEPLIBS)
+ 	$(CXX) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
+ 
+-install: all installdirs $(libdir)/ivl$(suffix)/sizer.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/sizer.conf $(libdir)/ivl$(suffix)/sizer-s.conf
++install: all installdirs installfiles
+ 
+-$(libdir)/ivl$(suffix)/sizer.tgt: ./sizer.tgt
+-	$(INSTALL_PROGRAM) ./sizer.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/sizer.tgt"
++F = ./sizer.tgt \
++	$(srcdir)/sizer.conf \
++	$(srcdir)/sizer-s.conf
+ 
+-$(libdir)/ivl$(suffix)/sizer.conf: $(srcdir)/sizer.conf
++installfiles: $(F) installdirs
++	$(INSTALL_PROGRAM) ./sizer.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/sizer.tgt"
+ 	$(INSTALL_DATA) $(srcdir)/sizer.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/sizer.conf"
+-
+-$(libdir)/ivl$(suffix)/sizer-s.conf: $(srcdir)/sizer-s.conf
+ 	$(INSTALL_DATA) $(srcdir)/sizer-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/sizer-s.conf"
+ 
+-
+ installdirs: $(srcdir)/../mkinstalldirs
+ 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)"
+ 
+--- a/tgt-stub/Makefile.in
++++ b/tgt-stub/Makefile.in
+@@ -82,17 +82,16 @@ endif
+ stub.tgt: $O $(TGTDEPLIBS)
+ 	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
+ 
+-install: all installdirs $(libdir)/ivl$(suffix)/stub.tgt \
+-	$(libdir)/ivl$(suffix)/stub.conf $(libdir)/ivl$(suffix)/stub-s.conf
++install: all installdirs installfiles
+ 
+-$(libdir)/ivl$(suffix)/stub.tgt: ./stub.tgt
+-	$(INSTALL_PROGRAM) ./stub.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.tgt"
+-
+-$(libdir)/ivl$(suffix)/stub.conf: stub.conf
+-	$(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.conf"
++F = ./stub.tgt \
++	./stub.conf \
++	./stub-s.conf
+ 
+-$(libdir)/ivl$(suffix)/stub-s.conf: stub-s.conf
+-	$(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/stub-s.conf"
++installfiles: $(F) installdirs
++	$(INSTALL_PROGRAM) ./stub.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.tgt"
++	$(INSTALL_DATA) ./stub.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.conf"
++	$(INSTALL_DATA) ./stub-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/stub-s.conf"
+ 
+ installdirs: $(srcdir)/../mkinstalldirs
+ 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)"
+--- a/tgt-verilog/Makefile.in
++++ b/tgt-verilog/Makefile.in
+@@ -80,12 +80,14 @@ endif
+ verilog.tgt: $O $(TGTDEPLIBS)
+ 	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
+ 
+-install: all installdirs $(libdir)/ivl/verilog.tgt \
+-	$(includedir)/vpi_user.h
++install: all installdirs installfiles
+ 
+-$(libdir)/ivl/verilog.tgt: ./verilog.tgt
+-	$(INSTALL_PROGRAM) ./verilog.tgt "$(DESTDIR)$(libdir)/ivl/verilog.tgt"
++F = ./verilog.tgt \
++	$(srcdir)/vpi_user.h
+ 
++installfiles: $(F) installdirs
++	$(INSTALL_PROGRAM) ./verilog.tgt "$(DESTDIR)$(libdir)/ivl/verilog.tgt"
++	$(INSTALL_DATA) $(srcdir)/vpi_user.h "$(DESTDIR)$(includedir)/vpi_user.h"
+ 
+ installdirs: $(srcdir)/../mkinstalldirs
+ 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl"
+--- a/tgt-vhdl/Makefile.in
++++ b/tgt-vhdl/Makefile.in
+@@ -90,17 +90,16 @@ stamp-vhdl_config-h: $(srcdir)/vhdl_config.h.in ../config.status
+ 	cd ..; ./config.status --header=tgt-vhdl/vhdl_config.h
+ vhdl_config.h: stamp-vhdl_config-h
+ 
+-install: all installdirs $(libdir)/ivl$(suffix)/vhdl.tgt $(libdir)/ivl$(suffix)/vhdl.conf \
+-	$(libdir)/ivl$(suffix)/vhdl-s.conf
++install: all installdirs installfiles
+ 
+-$(libdir)/ivl$(suffix)/vhdl.tgt: ./vhdl.tgt
+-	$(INSTALL_PROGRAM) ./vhdl.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.tgt"
+-
+-$(libdir)/ivl$(suffix)/vhdl.conf: vhdl.conf
+-	$(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.conf"
++F = ./vhdl.tgt \
++	./vhdl.conf \
++	./vhdl-s.conf
+ 
+-$(libdir)/ivl$(suffix)/vhdl-s.conf: vhdl-s.conf
+-	$(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl-s.conf"
++installfiles: $(F) installdirs
++	$(INSTALL_PROGRAM) ./vhdl.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.tgt"
++	$(INSTALL_DATA) ./vhdl.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.conf"
++	$(INSTALL_DATA) ./vhdl-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl-s.conf"
+ 
+ installdirs: $(srcdir)/../mkinstalldirs
+ 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)"
+--- a/tgt-vlog95/Makefile.in
++++ b/tgt-vlog95/Makefile.in
+@@ -81,18 +81,17 @@ endif
+ vlog95.tgt: $O $(TGTDEPLIBS)
+ 	$(CC) @shared@ $(LDFLAGS) -o $@ $O -lm $(TGTLDFLAGS)
+ 
+-install: all installdirs $(libdir)/ivl$(suffix)/vlog95.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/vlog95.conf $(libdir)/ivl$(suffix)/vlog95-s.conf
++install: all installdirs installfiles
+ 
+-$(libdir)/ivl$(suffix)/vlog95.tgt: ./vlog95.tgt
+-	$(INSTALL_PROGRAM) ./vlog95.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vlog95.tgt"
++F = ./vlog95.tgt \
++	$(srcdir)/vlog95.conf \
++	$(srcdir)/vlog95-s.conf
+ 
+-$(libdir)/ivl$(suffix)/vlog95.conf: $(srcdir)/vlog95.conf
++installfiles: $(F) installdirs
++	$(INSTALL_PROGRAM) ./vlog95.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vlog95.tgt"
+ 	$(INSTALL_DATA) $(srcdir)/vlog95.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vlog95.conf"
+-
+-$(libdir)/ivl$(suffix)/vlog95-s.conf: $(srcdir)/vlog95-s.conf
+ 	$(INSTALL_DATA) $(srcdir)/vlog95-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vlog95-s.conf"
+ 
+-
+ installdirs: $(srcdir)/../mkinstalldirs
+ 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)"
+ 
+--- a/tgt-vvp/Makefile.in
++++ b/tgt-vvp/Makefile.in
+@@ -104,17 +104,16 @@ stamp-vvp_config-h: $(srcdir)/vvp_config.h.in ../config.status
+ 	cd ..; ./config.status --header=tgt-vvp/vvp_config.h
+ vvp_config.h: stamp-vvp_config-h
+ 
+-install: all installdirs $(libdir)/ivl$(suffix)/vvp.tgt $(libdir)/ivl$(suffix)/vvp.conf $(libdir)/ivl$(suffix)/vvp-s.conf
++install: all installdirs installfiles
+ 
+-$(libdir)/ivl$(suffix)/vvp.tgt: ./vvp.tgt
+-	$(INSTALL_PROGRAM) ./vvp.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.tgt"
+-
+-$(libdir)/ivl$(suffix)/vvp.conf: vvp.conf
+-	$(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf"
+-
+-$(libdir)/ivl$(suffix)/vvp-s.conf: vvp-s.conf
+-	$(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf"
++F = ./vvp.tgt \
++	./vvp.conf \
++	./vvp-s.conf
+ 
++installfiles: $(F) installdirs
++	$(INSTALL_PROGRAM) ./vvp.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.tgt"
++	$(INSTALL_DATA) ./vvp.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf"
++	$(INSTALL_DATA) ./vvp-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf"
+ 
+ installdirs: $(srcdir)/../mkinstalldirs
+ 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)"
+--- a/vhdlpp/Makefile.in
++++ b/vhdlpp/Makefile.in
+@@ -127,9 +127,11 @@ lexor_keyword.o: lexor_keyword.cc parse.h
+ lexor_keyword.cc: $(srcdir)/lexor_keyword.gperf
+ 	gperf -o -i 7 --ignore-case -C -k 1-4,6,9,$$ -H keyword_hash -N check_identifier -t $(srcdir)/lexor_keyword.gperf > lexor_keyword.cc || (rm -f lexor_keyword.cc ; false)
+ 
+-install: all installdirs $(libdir)/ivl$(suffix)/vhdlpp@EXEEXT@
++install: all installdirs installfiles
+ 
+-$(libdir)/ivl$(suffix)/vhdlpp@EXEEXT@: vhdlpp@EXEEXT@
++F = vhdlpp@EXEEXT@
++
++installfiles: $(F) installdirs
+ 	$(INSTALL_PROGRAM) ./vhdlpp@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdlpp@EXEEXT@"
+ 
+ installdirs: $(srcdir)/../mkinstalldirs
+--- a/vpi/Makefile.in
++++ b/vpi/Makefile.in
+@@ -187,38 +187,25 @@ stamp-vpi_config-h: $(srcdir)/vpi_config.h.in ../config.status
+ 	cd ..; ./config.status --header=vpi/vpi_config.h
+ vpi_config.h: stamp-vpi_config-h
+ 
+-install: all installdirs \
+-    $(libdir)/libvpi$(suffix).a \
+-    $(vpidir)/system.vpi \
+-    $(vpidir)/va_math.vpi \
+-    $(vpidir)/v2005_math.vpi \
+-    $(vpidir)/v2009.vpi \
+-    $(vpidir)/vhdl_sys.vpi \
+-    $(vpidir)/vhdl_textio.vpi \
+-    $(vpidir)/vpi_debug.vpi
+-
+-$(libdir)/libvpi$(suffix).a : ./libvpi.a
+-	$(INSTALL_DATA) libvpi.a "$(DESTDIR)$(libdir)/libvpi$(suffix).a"
+-
+-$(vpidir)/system.vpi: ./system.vpi
++install: all installdirs installfiles
++
++F = ./libvpi.a \
++	./system.vpi \
++	./va_math.vpi \
++	./v2005_math.vpi \
++	./v2009.vpi \
++	./vhdl_sys.vpi \
++	./vhdl_textio.vpi \
++	./vpi_debug.vpi
++
++installfiles: $(F) installdirs
++	$(INSTALL_DATA) ./libvpi.a "$(DESTDIR)$(libdir)/libvpi$(suffix).a"
+ 	$(INSTALL_PROGRAM) ./system.vpi "$(DESTDIR)$(vpidir)/system.vpi"
+-
+-$(vpidir)/va_math.vpi: ./va_math.vpi
+ 	$(INSTALL_PROGRAM) ./va_math.vpi "$(DESTDIR)$(vpidir)/va_math.vpi"
+-
+-$(vpidir)/v2005_math.vpi: ./v2005_math.vpi
+ 	$(INSTALL_PROGRAM) ./v2005_math.vpi "$(DESTDIR)$(vpidir)/v2005_math.vpi"
+-
+-$(vpidir)/v2009.vpi: ./v2009.vpi
+ 	$(INSTALL_PROGRAM) ./v2009.vpi "$(DESTDIR)$(vpidir)/v2009.vpi"
+-
+-$(vpidir)/vhdl_sys.vpi: ./vhdl_sys.vpi
+ 	$(INSTALL_PROGRAM) ./vhdl_sys.vpi "$(DESTDIR)$(vpidir)/vhdl_sys.vpi"
+-
+-$(vpidir)/vhdl_textio.vpi: ./vhdl_textio.vpi
+ 	$(INSTALL_PROGRAM) ./vhdl_textio.vpi "$(DESTDIR)$(vpidir)/vhdl_textio.vpi"
+-
+-$(vpidir)/vpi_debug.vpi: ./vpi_debug.vpi
+ 	$(INSTALL_PROGRAM) ./vpi_debug.vpi "$(DESTDIR)$(vpidir)/vpi_debug.vpi"
+ 
+ installdirs: $(srcdir)/../mkinstalldirs
+--- a/vvp/Makefile.in
++++ b/vvp/Makefile.in
+@@ -162,18 +162,18 @@ vvp.pdf: vvp.ps
+ 
+ ifeq (@MINGW32@,yes)
+ ifeq ($(MAN),none)
+-INSTALL_DOC = $(mandir)/man1/vvp$(suffix).1
++INSTALL_DOC = installman
+ else
+ ifeq ($(PS2PDF),none)
+-INSTALL_DOC = $(mandir)/man1/vvp$(suffix).1
++INSTALL_DOC = installman
+ else
+-INSTALL_DOC = $(prefix)/vvp$(suffix).pdf $(mandir)/man1/vvp$(suffix).1
++INSTALL_DOC = installpdf installman
+ all: vvp.pdf
+ endif
+ endif
+ INSTALL_DOCDIR = $(mandir)/man1
+ else
+-INSTALL_DOC = $(mandir)/man1/vvp$(suffix).1
++INSTALL_DOC = installman
+ INSTALL_DOCDIR = $(mandir)/man1
+ endif
+ 
+@@ -182,17 +182,19 @@ stamp-config-h: $(srcdir)/config.h.in ../config.status
+ 	cd ..; ./config.status --header=vvp/config.h
+ config.h: stamp-config-h
+ 
+-install: all installdirs $(bindir)/vvp$(suffix)@EXEEXT@ $(INSTALL_DOC)
++install: all installdirs installfiles
+ 
+-$(bindir)/vvp$(suffix)@EXEEXT@: ./vvp@EXEEXT@
+-	$(INSTALL_PROGRAM) ./vvp@EXEEXT@ "$(DESTDIR)$(bindir)/vvp$(suffix)@EXEEXT@"
++F = ./vvp@EXEEXT@ $(INSTALL_DOC)
+ 
+-$(mandir)/man1/vvp$(suffix).1: vvp.man
++installman: vvp.man installdirs
+ 	$(INSTALL_DATA) vvp.man "$(DESTDIR)$(mandir)/man1/vvp$(suffix).1"
+ 
+-$(prefix)/vvp$(suffix).pdf: vvp.pdf
++installpdf: vvp.pdf installdirs
+ 	$(INSTALL_DATA) vvp.pdf "$(DESTDIR)$(prefix)/vvp$(suffix).pdf"
+ 
++installfiles: $(F) installdirs
++	$(INSTALL_PROGRAM) ./vvp@EXEEXT@ "$(DESTDIR)$(bindir)/vvp$(suffix)@EXEEXT@"
++
+ installdirs: $(srcdir)/../mkinstalldirs
+ 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(INSTALL_DOCDIR)"
+ 

diff --git a/sci-electronics/iverilog/iverilog-9999.ebuild b/sci-electronics/iverilog/iverilog-9999.ebuild
index 183ed6f2023..46f342bfb5a 100644
--- a/sci-electronics/iverilog/iverilog-9999.ebuild
+++ b/sci-electronics/iverilog/iverilog-9999.ebuild
@@ -38,6 +38,10 @@ DEPEND="
 	${RDEPEND}
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-file-missing.patch #705412
+)
+
 src_prepare() {
 	default
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/iverilog/, sci-electronics/iverilog/files/
@ 2020-01-30  6:33 Joonas Niilola
  0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-01-30  6:33 UTC (permalink / raw
  To: gentoo-commits

commit:     560664303060100467ca053a94decb296da113d8
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Wed Jan 29 16:23:37 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 06:33:05 2020 +0000
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 <vowstar <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> 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 00000000000..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
++++ b/tgt-pal/Makefile.in
+@@ -79,6 +79,7 @@ endif
+ pal.tgt: $O $(TGTDEPLIBS)
+ 	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS) -lipal
+ 
++.PHONY: all installdirs $(libdir)/ivl/pal.tgt
+ install: all installdirs $(libdir)/ivl/pal.tgt
+ 
+ $(libdir)/ivl/pal.tgt: ./pal.tgt
+--- a/tgt-pcb/Makefile.in
++++ b/tgt-pcb/Makefile.in
+@@ -104,6 +104,7 @@ endif
+ pcb.tgt: $O $(TGTDEPLIBS)
+ 	$(CXX) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
+ 
++.PHONY: all installdirs $(libdir)/ivl$(suffix)/pcb.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/pcb.conf $(libdir)/ivl$(suffix)/pcb-s.conf
+ install: all installdirs $(libdir)/ivl$(suffix)/pcb.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/pcb.conf $(libdir)/ivl$(suffix)/pcb-s.conf
+ 
+ $(libdir)/ivl$(suffix)/pcb.tgt: ./pcb.tgt
+--- a/tgt-sizer/Makefile.in
++++ b/tgt-sizer/Makefile.in
+@@ -80,6 +80,7 @@ endif
+ sizer.tgt: $O $(TGTDEPLIBS)
+ 	$(CXX) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
+ 
++.PHONY: all installdirs $(libdir)/ivl$(suffix)/sizer.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/sizer.conf $(libdir)/ivl$(suffix)/sizer-s.conf
+ install: all installdirs $(libdir)/ivl$(suffix)/sizer.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/sizer.conf $(libdir)/ivl$(suffix)/sizer-s.conf
+ 
+ $(libdir)/ivl$(suffix)/sizer.tgt: ./sizer.tgt
+--- a/tgt-stub/Makefile.in
++++ b/tgt-stub/Makefile.in
+@@ -81,6 +81,7 @@ endif
+ stub.tgt: $O $(TGTDEPLIBS)
+ 	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
+ 
++.PHONY: all installdirs $(libdir)/ivl$(suffix)/stub.tgt $(libdir)/ivl$(suffix)/stub.conf $(libdir)/ivl$(suffix)/stub-s.conf
+ install: all installdirs $(libdir)/ivl$(suffix)/stub.tgt \
+ 	$(libdir)/ivl$(suffix)/stub.conf $(libdir)/ivl$(suffix)/stub-s.conf
+ 
+--- a/tgt-verilog/Makefile.in
++++ b/tgt-verilog/Makefile.in
+@@ -79,6 +79,7 @@ endif
+ verilog.tgt: $O $(TGTDEPLIBS)
+ 	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
+ 
++.PHONY: all installdirs $(libdir)/ivl/verilog.tgt $(includedir)/vpi_user.h
+ install: all installdirs $(libdir)/ivl/verilog.tgt \
+ 	$(includedir)/vpi_user.h
+ 
+--- a/tgt-vhdl/Makefile.in
++++ b/tgt-vhdl/Makefile.in
+@@ -89,6 +89,7 @@ stamp-vhdl_config-h: $(srcdir)/vhdl_config.h.in ../config.status
+ 	cd ..; ./config.status --header=tgt-vhdl/vhdl_config.h
+ vhdl_config.h: stamp-vhdl_config-h
+ 
++.PHONY: all installdirs $(libdir)/ivl$(suffix)/vhdl.tgt $(libdir)/ivl$(suffix)/vhdl.conf $(libdir)/ivl$(suffix)/vhdl-s.conf
+ install: all installdirs $(libdir)/ivl$(suffix)/vhdl.tgt $(libdir)/ivl$(suffix)/vhdl.conf \
+ 	$(libdir)/ivl$(suffix)/vhdl-s.conf
+ 
+--- a/tgt-vlog95/Makefile.in
++++ b/tgt-vlog95/Makefile.in
+@@ -80,6 +80,7 @@ endif
+ vlog95.tgt: $O $(TGTDEPLIBS)
+ 	$(CC) @shared@ $(LDFLAGS) -o $@ $O -lm $(TGTLDFLAGS)
+ 
++.PHONY: all installdirs $(libdir)/ivl$(suffix)/vlog95.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/vlog95.conf $(libdir)/ivl$(suffix)/vlog95-s.conf
+ install: all installdirs $(libdir)/ivl$(suffix)/vlog95.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/vlog95.conf $(libdir)/ivl$(suffix)/vlog95-s.conf
+ 
+ $(libdir)/ivl$(suffix)/vlog95.tgt: ./vlog95.tgt
+--- a/tgt-vvp/Makefile.in
++++ b/tgt-vvp/Makefile.in
+@@ -103,6 +103,7 @@ stamp-vvp_config-h: $(srcdir)/vvp_config.h.in ../config.status
+ 	cd ..; ./config.status --header=tgt-vvp/vvp_config.h
+ vvp_config.h: stamp-vvp_config-h
+ 
++.PHONY: all installdirs $(libdir)/ivl$(suffix)/vvp.tgt $(libdir)/ivl$(suffix)/vvp.conf $(libdir)/ivl$(suffix)/vvp-s.conf
+ install: all installdirs $(libdir)/ivl$(suffix)/vvp.tgt $(libdir)/ivl$(suffix)/vvp.conf $(libdir)/ivl$(suffix)/vvp-s.conf
+ 
+ $(libdir)/ivl$(suffix)/vvp.tgt: ./vvp.tgt
+--- a/vhdlpp/Makefile.in
++++ b/vhdlpp/Makefile.in
+@@ -127,6 +127,7 @@ lexor_keyword.o: lexor_keyword.cc parse.h
+ lexor_keyword.cc: $(srcdir)/lexor_keyword.gperf
+ 	gperf -o -i 7 --ignore-case -C -k 1-4,6,9,$$ -H keyword_hash -N check_identifier -t $(srcdir)/lexor_keyword.gperf > lexor_keyword.cc || (rm -f lexor_keyword.cc ; false)
+ 
++.PHONY: all installdirs $(libdir)/ivl$(suffix)/vhdlpp@EXEEXT@
+ install: all installdirs $(libdir)/ivl$(suffix)/vhdlpp@EXEEXT@
+ 
+ $(libdir)/ivl$(suffix)/vhdlpp@EXEEXT@: vhdlpp@EXEEXT@
+--- a/vpi/Makefile.in
++++ b/vpi/Makefile.in
+@@ -171,6 +171,7 @@ stamp-vpi_config-h: $(srcdir)/vpi_config.h.in ../config.status
+ 	cd ..; ./config.status --header=vpi/vpi_config.h
+ vpi_config.h: stamp-vpi_config-h
+ 
++.PHONY: all installdirs $(vpidir)/system.vpi $(vpidir)/system.sft $(vpidir)/va_math.vpi $(vpidir)/va_math.sft $(vpidir)/v2005_math.vpi $(vpidir)/v2005_math.sft $(vpidir)/v2009.vpi $(vpidir)/v2009.sft $(vpidir)/vhdl_sys.vpi $(vpidir)/vhdl_sys.sft $(vpidir)/vpi_debug.vpi
+ install: all installdirs \
+     $(vpidir)/system.vpi $(vpidir)/system.sft \
+     $(vpidir)/va_math.vpi $(vpidir)/va_math.sft \
+--- a/vvp/Makefile.in
++++ b/vvp/Makefile.in
+@@ -205,6 +205,7 @@ stamp-config-h: $(srcdir)/config.h.in ../config.status
+ 	cd ..; ./config.status --header=vvp/config.h
+ config.h: stamp-config-h
+ 
++.PHONY: all installdirs $(bindir)/vvp$(suffix)@EXEEXT@ $(libdir)/libvpi$(suffix).a $(INSTALL_DOC)
+ install: all installdirs $(bindir)/vvp$(suffix)@EXEEXT@ $(libdir)/libvpi$(suffix).a $(INSTALL_DOC)
+ 
+ $(bindir)/vvp$(suffix)@EXEEXT@: ./vvp@EXEEXT@

diff --git a/sci-electronics/iverilog/iverilog-10.3.ebuild b/sci-electronics/iverilog/iverilog-10.3.ebuild
index 183ed6f2023..ae61d822ad4 100644
--- a/sci-electronics/iverilog/iverilog-10.3.ebuild
+++ b/sci-electronics/iverilog/iverilog-10.3.ebuild
@@ -38,6 +38,10 @@ DEPEND="
 	${RDEPEND}
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3-file-missing.patch #705412
+)
+
 src_prepare() {
 	default
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/iverilog/, sci-electronics/iverilog/files/
@ 2020-02-17  7:23 Sergei Trofimovich
  0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2020-02-17  7:23 UTC (permalink / raw
  To: gentoo-commits

commit:     4202315a5c0a34f3ce0be67ef3216efbae1c6532
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Thu Jan 30 07:32:15 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 07:23:23 2020 +0000
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 <vowstar <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14619
Signed-off-by: Sergei Trofimovich <slyfox <AT> 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 00000000000..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  <string.h>
+ 
++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() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/iverilog/, sci-electronics/iverilog/files/
@ 2020-03-08 12:58 Joonas Niilola
  0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-03-08 12:58 UTC (permalink / raw
  To: gentoo-commits

commit:     1b11d304e51f599f02cda5a20b01cd3b67bc37c9
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Sat Feb 29 17:59:36 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar  8 12:57:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b11d304

sci-electronics/iverilog: fix build problem in iverilog-9999.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 <vowstar <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14809
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/iverilog-9999-file-missing.patch         | 644 ---------------------
 sci-electronics/iverilog/iverilog-9999.ebuild      |   4 -
 2 files changed, 648 deletions(-)

diff --git a/sci-electronics/iverilog/files/iverilog-9999-file-missing.patch b/sci-electronics/iverilog/files/iverilog-9999-file-missing.patch
deleted file mode 100644
index a8d809cef8e..00000000000
--- a/sci-electronics/iverilog/files/iverilog-9999-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"
- 
--$(mandir)/man1/iverilog-vpi$(suffix).1: iverilog-vpi.man installdirs
--	$(INSTALL_DATA) iverilog-vpi.man "$(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1"
--
--$(prefix)/iverilog-vpi$(suffix).pdf: iverilog-vpi.pdf installdirs
--	$(INSTALL_DATA) iverilog-vpi.pdf "$(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf"
--
--
- installdirs: $(srcdir)/mkinstalldirs
- 	$(srcdir)/mkinstalldirs "$(DESTDIR)$(bindir)" \
- 	    "$(DESTDIR)$(includedir)" \
---- a/cadpli/Makefile.in
-+++ b/cadpli/Makefile.in
-@@ -79,9 +79,11 @@ endif
- cadpli.vpl: $O ../vpi/libvpi.a ../libveriuser/libveriuser.o
- 	$(CC) @shared@ $(LDFLAGS) -o $@ $O ../libveriuser/libveriuser.o $(SYSTEM_VPI_LDFLAGS)
- 
--install: all installdirs $(vpidir)/cadpli.vpl
-+install: all installdirs installfiles
- 
--$(vpidir)/cadpli.vpl: ./cadpli.vpl
-+F = ./cadpli.vpl
-+
-+installfiles: $(F) installdirs
- 	$(INSTALL_PROGRAM) ./cadpli.vpl "$(DESTDIR)$(vpidir)/cadpli.vpl"
- 
- installdirs: $(srcdir)/../mkinstalldirs
---- a/driver-vpi/Makefile.in
-+++ b/driver-vpi/Makefile.in
-@@ -94,9 +94,11 @@ res.o: res.rc
- 	$(WINDRES) -i res.rc -o res.o
- #
- 
--install: all installdirs $(bindir)/iverilog-vpi$(suffix)@EXEEXT@
-+install: all installdirs installfiles
- 
--$(bindir)/iverilog-vpi$(suffix)@EXEEXT@: ./iverilog-vpi@EXEEXT@
-+F = ./iverilog-vpi@EXEEXT@
-+
-+installfiles: $(F) installdirs
- 	$(INSTALL_PROGRAM) ./iverilog-vpi@EXEEXT@ "$(bindir)/iverilog-vpi$(suffix)@EXEEXT@"
- ifeq (@WIN32@,yes)
- ifneq ($(HOSTCC),$(CC))
---- a/driver/Makefile.in
-+++ b/driver/Makefile.in
-@@ -112,32 +112,35 @@ iverilog.pdf: iverilog.ps
- 
- ifeq (@MINGW32@,yes)
- ifeq ($(MAN),none)
--INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1
-+INSTALL_DOC = installman
- else
- ifeq ($(PS2PDF),none)
--INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1
-+INSTALL_DOC = installman
- else
--INSTALL_DOC = $(prefix)/iverilog$(suffix).pdf $(mandir)/man1/iverilog$(suffix).1
-+INSTALL_DOC = installpdf installman
- all: iverilog.pdf
- endif
- endif
- INSTALL_DOCDIR = $(mandir)/man1
- else
--INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1
-+INSTALL_DOC = installman
- INSTALL_DOCDIR = $(mandir)/man1
- endif
- 
--install: all installdirs $(bindir)/iverilog$(suffix)@EXEEXT@ $(INSTALL_DOC)
-+install: all installdirs installfiles
- 
--$(bindir)/iverilog$(suffix)@EXEEXT@: ./iverilog@EXEEXT@
--	$(INSTALL_PROGRAM) ./iverilog@EXEEXT@ "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@"
-+F = ./iverilog@EXEEXT@ \
-+	$(INSTALL_DOC)
- 
--$(mandir)/man1/iverilog$(suffix).1: iverilog.man
-+installman: iverilog.man installdirs
- 	$(INSTALL_DATA) iverilog.man "$(DESTDIR)$(mandir)/man1/iverilog$(suffix).1"
- 
--$(prefix)/iverilog$(suffix).pdf: iverilog.pdf
-+installpdf: iverilog.pdf installdirs
- 	$(INSTALL_DATA) iverilog.pdf "$(DESTDIR)$(prefix)/iverilog$(suffix).pdf"
- 
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./iverilog@EXEEXT@ "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@"
-+
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(INSTALL_DOCDIR)"
- 
---- a/ivlpp/Makefile.in
-+++ b/ivlpp/Makefile.in
-@@ -71,9 +71,11 @@ ivlpp@EXEEXT@: $O
- lexor.c: $(srcdir)/lexor.lex
- 	$(LEX) -t $< > $@
- 
--install: all installdirs $(libdir)/ivl$(suffix)/ivlpp@EXEEXT@
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/ivlpp@EXEEXT@: ivlpp@EXEEXT@
-+F = ivlpp@EXEEXT@
-+
-+installfiles: $(F) installdirs
- 	$(INSTALL_PROGRAM) ./ivlpp@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivlpp@EXEEXT@"
- 
- installdirs: $(srcdir)/../mkinstalldirs
---- a/libveriuser/Makefile.in
-+++ b/libveriuser/Makefile.in
-@@ -103,9 +103,11 @@ libveriuser.a: libveriuser.o
- 	$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
- 	mv $*.d dep
- 
--install:: all installdirs $(libdir)/libveriuser$(suffix).a $(INSTALL32)
-+install:: all installdirs installfiles
- 
--$(libdir)/libveriuser$(suffix).a: ./libveriuser.a
-+F = ./libveriuser.a
-+
-+installfiles: $(F) installdirs
- 	$(INSTALL_DATA) ./libveriuser.a "$(DESTDIR)$(libdir)/libveriuser$(suffix).a"
- 
- installdirs: $(srcdir)/../mkinstalldirs
---- a/tgt-blif/Makefile.in
-+++ b/tgt-blif/Makefile.in
-@@ -83,18 +83,17 @@ endif
- blif.tgt: $O $(TGTDEPLIBS)
- 	$(CXX) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
- 
--install: all installdirs $(libdir)/ivl$(suffix)/blif.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/blif.conf $(libdir)/ivl$(suffix)/blif-s.conf
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/blif.tgt: ./blif.tgt
--	$(INSTALL_PROGRAM) ./blif.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/blif.tgt"
-+F = ./blif.tgt \
-+	$(srcdir)/blif.conf \
-+	$(srcdir)/blif-s.conf
- 
--$(libdir)/ivl$(suffix)/blif.conf: $(srcdir)/blif.conf
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./blif.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/blif.tgt"
- 	$(INSTALL_DATA) $(srcdir)/blif.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/blif.conf"
--
--$(libdir)/ivl$(suffix)/blif-s.conf: $(srcdir)/blif-s.conf
- 	$(INSTALL_DATA) $(srcdir)/blif-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/blif-s.conf"
- 
--
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)"
- 
---- a/tgt-fpga/Makefile.in
-+++ b/tgt-fpga/Makefile.in
-@@ -93,38 +93,38 @@ iverilog-fpga.pdf: iverilog-fpga.ps
- 	ps2pdf iverilog-fpga.ps iverilog-fpga.pdf
- 
- ifeq (@WIN32@,yes)
--INSTALL_DOC = $(prefix)/iverilog-fpga$(suffix).pdf $(mandir)/man1/iverilog-fpga$(suffix).1
-+INSTALL_DOC = installpdf installman
- INSTALL_DOCDIR = $(mandir)/man1
- all: iverilog-fpga.pdf
- else
--INSTALL_DOC = $(mandir)/man1/iverilog-fpga$(suffix).1
-+INSTALL_DOC = installman
- INSTALL_DOCDIR = $(mandir)/man1
- endif
- 
--install: all installdirs $(libdir)/ivl$(suffix)/fpga.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/fpga.conf $(libdir)/ivl$(suffix)/fpga-s.conf
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/fpga.tgt: ./fpga.tgt
--	$(INSTALL_PROGRAM) ./fpga.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.tgt"
--
--$(libdir)/ivl$(suffix)/fpga.conf: $(srcdir)/fpga.conf
--	$(INSTALL_DATA) $(srcdir)/fpga.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.conf"
--
--$(libdir)/ivl$(suffix)/fpga-s.conf: $(srcdir)/fpga-s.conf
--	$(INSTALL_DATA) $(srcdir)/fpga-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga-s.conf"
-+F = ./fpga.tgt \
-+	$(srcdir)/fpga.conf \
-+	$(srcdir)/fpga-s.conf \
-+	$(INSTALL_DOC)
- 
--
--$(mandir)/man1/iverilog-fpga$(suffix).1: $(srcdir)/iverilog-fpga.man
-+installman: $(srcdir)/iverilog-fpga.man installdirs
- 	$(INSTALL_DATA) $(srcdir)/iverilog-fpga.man "$(DESTDIR)$(mandir)/man1/iverilog-fpga$(suffix).1"
- 
--$(prefix)/iverilog-fpga$(suffix).pdf: iverilog-fpga.pdf
-+installpdf: iverilog-fpga.pdf installdirs
- 	$(INSTALL_DATA) iverilog-fpga.pdf "$(DESTDIR)$(prefix)/iverilog-fpga$(suffix).pdf"
- 
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./fpga.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.tgt"
-+	$(INSTALL_DATA) $(srcdir)/fpga.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.conf"
-+	$(INSTALL_DATA) $(srcdir)/fpga-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga-s.conf"
-+
- installdirs: $(srcdir)/../mkinstalldirs
--	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)"
-+	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)" "$(DESTDIR)$(INSTALL_DOCDIR)"
- 
- uninstall:
- 	rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.tgt"
--	rm -f "$(DESTDIR)$(INSTALL_DOC)"
-+	rm -f "$(DESTDIR)$(prefix)/iverilog-fpga$(suffix).pdf" "$(DESTDIR)$(mandir)/man1/iverilog-fpga$(suffix).1"
- 	rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga-s.conf"
- 	rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.conf"
- 
---- a/tgt-null/Makefile.in
-+++ b/tgt-null/Makefile.in
-@@ -81,18 +81,17 @@ endif
- null.tgt: $O $(TGTDEPLIBS)
- 	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
- 
--install: all installdirs $(libdir)/ivl$(suffix)/null.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/null.conf $(libdir)/ivl$(suffix)/null-s.conf
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/null.tgt: ./null.tgt
--	$(INSTALL_PROGRAM) ./null.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/null.tgt"
-+F = ./null.tgt \
-+	$(srcdir)/null.conf \
-+	$(srcdir)/null-s.conf
- 
--$(libdir)/ivl$(suffix)/null.conf: $(srcdir)/null.conf
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./null.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/null.tgt"
- 	$(INSTALL_DATA) $(srcdir)/null.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/null.conf"
--
--$(libdir)/ivl$(suffix)/null-s.conf: $(srcdir)/null-s.conf
- 	$(INSTALL_DATA) $(srcdir)/null-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/null-s.conf"
- 
--
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)"
- 
---- a/tgt-pal/Makefile.in
-+++ b/tgt-pal/Makefile.in
-@@ -80,11 +80,12 @@ endif
- pal.tgt: $O $(TGTDEPLIBS)
- 	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS) -lipal
- 
--install: all installdirs $(libdir)/ivl/pal.tgt
-+install: all installdirs installfiles
- 
--$(libdir)/ivl/pal.tgt: ./pal.tgt
--	$(INSTALL_PROGRAM) ./pal.tgt "$(DESTDIR)$(libdir)/ivl/pal.tgt"
-+F = ./pal.tgt
- 
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./pal.tgt "$(DESTDIR)$(libdir)/ivl/pal.tgt"
- 
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)/$(libdir)/ivl"
---- a/tgt-pcb/Makefile.in
-+++ b/tgt-pcb/Makefile.in
-@@ -105,18 +105,17 @@ endif
- pcb.tgt: $O $(TGTDEPLIBS)
- 	$(CXX) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
- 
--install: all installdirs $(libdir)/ivl$(suffix)/pcb.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/pcb.conf $(libdir)/ivl$(suffix)/pcb-s.conf
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/pcb.tgt: ./pcb.tgt
--	$(INSTALL_PROGRAM) ./pcb.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/pcb.tgt"
-+F = ./pcb.tgt \
-+	$(srcdir)/pcb.conf \
-+	$(srcdir)/pcb-s.conf
- 
--$(libdir)/ivl$(suffix)/pcb.conf: $(srcdir)/pcb.conf
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./pcb.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/pcb.tgt"
- 	$(INSTALL_DATA) $(srcdir)/pcb.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/pcb.conf"
--
--$(libdir)/ivl$(suffix)/pcb-s.conf: $(srcdir)/pcb-s.conf
- 	$(INSTALL_DATA) $(srcdir)/pcb-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/pcb-s.conf"
- 
--
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)"
- 
---- a/tgt-sizer/Makefile.in
-+++ b/tgt-sizer/Makefile.in
-@@ -81,18 +81,17 @@ endif
- sizer.tgt: $O $(TGTDEPLIBS)
- 	$(CXX) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
- 
--install: all installdirs $(libdir)/ivl$(suffix)/sizer.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/sizer.conf $(libdir)/ivl$(suffix)/sizer-s.conf
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/sizer.tgt: ./sizer.tgt
--	$(INSTALL_PROGRAM) ./sizer.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/sizer.tgt"
-+F = ./sizer.tgt \
-+	$(srcdir)/sizer.conf \
-+	$(srcdir)/sizer-s.conf
- 
--$(libdir)/ivl$(suffix)/sizer.conf: $(srcdir)/sizer.conf
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./sizer.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/sizer.tgt"
- 	$(INSTALL_DATA) $(srcdir)/sizer.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/sizer.conf"
--
--$(libdir)/ivl$(suffix)/sizer-s.conf: $(srcdir)/sizer-s.conf
- 	$(INSTALL_DATA) $(srcdir)/sizer-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/sizer-s.conf"
- 
--
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)"
- 
---- a/tgt-stub/Makefile.in
-+++ b/tgt-stub/Makefile.in
-@@ -82,17 +82,16 @@ endif
- stub.tgt: $O $(TGTDEPLIBS)
- 	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
- 
--install: all installdirs $(libdir)/ivl$(suffix)/stub.tgt \
--	$(libdir)/ivl$(suffix)/stub.conf $(libdir)/ivl$(suffix)/stub-s.conf
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/stub.tgt: ./stub.tgt
--	$(INSTALL_PROGRAM) ./stub.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.tgt"
--
--$(libdir)/ivl$(suffix)/stub.conf: stub.conf
--	$(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.conf"
-+F = ./stub.tgt \
-+	./stub.conf \
-+	./stub-s.conf
- 
--$(libdir)/ivl$(suffix)/stub-s.conf: stub-s.conf
--	$(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/stub-s.conf"
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./stub.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.tgt"
-+	$(INSTALL_DATA) ./stub.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.conf"
-+	$(INSTALL_DATA) ./stub-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/stub-s.conf"
- 
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)"
---- a/tgt-verilog/Makefile.in
-+++ b/tgt-verilog/Makefile.in
-@@ -80,12 +80,14 @@ endif
- verilog.tgt: $O $(TGTDEPLIBS)
- 	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
- 
--install: all installdirs $(libdir)/ivl/verilog.tgt \
--	$(includedir)/vpi_user.h
-+install: all installdirs installfiles
- 
--$(libdir)/ivl/verilog.tgt: ./verilog.tgt
--	$(INSTALL_PROGRAM) ./verilog.tgt "$(DESTDIR)$(libdir)/ivl/verilog.tgt"
-+F = ./verilog.tgt \
-+	$(srcdir)/vpi_user.h
- 
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./verilog.tgt "$(DESTDIR)$(libdir)/ivl/verilog.tgt"
-+	$(INSTALL_DATA) $(srcdir)/vpi_user.h "$(DESTDIR)$(includedir)/vpi_user.h"
- 
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl"
---- a/tgt-vhdl/Makefile.in
-+++ b/tgt-vhdl/Makefile.in
-@@ -90,17 +90,16 @@ stamp-vhdl_config-h: $(srcdir)/vhdl_config.h.in ../config.status
- 	cd ..; ./config.status --header=tgt-vhdl/vhdl_config.h
- vhdl_config.h: stamp-vhdl_config-h
- 
--install: all installdirs $(libdir)/ivl$(suffix)/vhdl.tgt $(libdir)/ivl$(suffix)/vhdl.conf \
--	$(libdir)/ivl$(suffix)/vhdl-s.conf
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/vhdl.tgt: ./vhdl.tgt
--	$(INSTALL_PROGRAM) ./vhdl.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.tgt"
--
--$(libdir)/ivl$(suffix)/vhdl.conf: vhdl.conf
--	$(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.conf"
-+F = ./vhdl.tgt \
-+	./vhdl.conf \
-+	./vhdl-s.conf
- 
--$(libdir)/ivl$(suffix)/vhdl-s.conf: vhdl-s.conf
--	$(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl-s.conf"
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./vhdl.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.tgt"
-+	$(INSTALL_DATA) ./vhdl.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.conf"
-+	$(INSTALL_DATA) ./vhdl-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl-s.conf"
- 
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)"
---- a/tgt-vlog95/Makefile.in
-+++ b/tgt-vlog95/Makefile.in
-@@ -81,18 +81,17 @@ endif
- vlog95.tgt: $O $(TGTDEPLIBS)
- 	$(CC) @shared@ $(LDFLAGS) -o $@ $O -lm $(TGTLDFLAGS)
- 
--install: all installdirs $(libdir)/ivl$(suffix)/vlog95.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/vlog95.conf $(libdir)/ivl$(suffix)/vlog95-s.conf
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/vlog95.tgt: ./vlog95.tgt
--	$(INSTALL_PROGRAM) ./vlog95.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vlog95.tgt"
-+F = ./vlog95.tgt \
-+	$(srcdir)/vlog95.conf \
-+	$(srcdir)/vlog95-s.conf
- 
--$(libdir)/ivl$(suffix)/vlog95.conf: $(srcdir)/vlog95.conf
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./vlog95.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vlog95.tgt"
- 	$(INSTALL_DATA) $(srcdir)/vlog95.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vlog95.conf"
--
--$(libdir)/ivl$(suffix)/vlog95-s.conf: $(srcdir)/vlog95-s.conf
- 	$(INSTALL_DATA) $(srcdir)/vlog95-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vlog95-s.conf"
- 
--
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)"
- 
---- a/tgt-vvp/Makefile.in
-+++ b/tgt-vvp/Makefile.in
-@@ -104,17 +104,16 @@ stamp-vvp_config-h: $(srcdir)/vvp_config.h.in ../config.status
- 	cd ..; ./config.status --header=tgt-vvp/vvp_config.h
- vvp_config.h: stamp-vvp_config-h
- 
--install: all installdirs $(libdir)/ivl$(suffix)/vvp.tgt $(libdir)/ivl$(suffix)/vvp.conf $(libdir)/ivl$(suffix)/vvp-s.conf
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/vvp.tgt: ./vvp.tgt
--	$(INSTALL_PROGRAM) ./vvp.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.tgt"
--
--$(libdir)/ivl$(suffix)/vvp.conf: vvp.conf
--	$(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf"
--
--$(libdir)/ivl$(suffix)/vvp-s.conf: vvp-s.conf
--	$(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf"
-+F = ./vvp.tgt \
-+	./vvp.conf \
-+	./vvp-s.conf
- 
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./vvp.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.tgt"
-+	$(INSTALL_DATA) ./vvp.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf"
-+	$(INSTALL_DATA) ./vvp-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf"
- 
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)"
---- a/vhdlpp/Makefile.in
-+++ b/vhdlpp/Makefile.in
-@@ -127,9 +127,11 @@ lexor_keyword.o: lexor_keyword.cc parse.h
- lexor_keyword.cc: $(srcdir)/lexor_keyword.gperf
- 	gperf -o -i 7 --ignore-case -C -k 1-4,6,9,$$ -H keyword_hash -N check_identifier -t $(srcdir)/lexor_keyword.gperf > lexor_keyword.cc || (rm -f lexor_keyword.cc ; false)
- 
--install: all installdirs $(libdir)/ivl$(suffix)/vhdlpp@EXEEXT@
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/vhdlpp@EXEEXT@: vhdlpp@EXEEXT@
-+F = vhdlpp@EXEEXT@
-+
-+installfiles: $(F) installdirs
- 	$(INSTALL_PROGRAM) ./vhdlpp@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdlpp@EXEEXT@"
- 
- installdirs: $(srcdir)/../mkinstalldirs
---- a/vpi/Makefile.in
-+++ b/vpi/Makefile.in
-@@ -187,38 +187,25 @@ stamp-vpi_config-h: $(srcdir)/vpi_config.h.in ../config.status
- 	cd ..; ./config.status --header=vpi/vpi_config.h
- vpi_config.h: stamp-vpi_config-h
- 
--install: all installdirs \
--    $(libdir)/libvpi$(suffix).a \
--    $(vpidir)/system.vpi \
--    $(vpidir)/va_math.vpi \
--    $(vpidir)/v2005_math.vpi \
--    $(vpidir)/v2009.vpi \
--    $(vpidir)/vhdl_sys.vpi \
--    $(vpidir)/vhdl_textio.vpi \
--    $(vpidir)/vpi_debug.vpi
--
--$(libdir)/libvpi$(suffix).a : ./libvpi.a
--	$(INSTALL_DATA) libvpi.a "$(DESTDIR)$(libdir)/libvpi$(suffix).a"
--
--$(vpidir)/system.vpi: ./system.vpi
-+install: all installdirs installfiles
-+
-+F = ./libvpi.a \
-+	./system.vpi \
-+	./va_math.vpi \
-+	./v2005_math.vpi \
-+	./v2009.vpi \
-+	./vhdl_sys.vpi \
-+	./vhdl_textio.vpi \
-+	./vpi_debug.vpi
-+
-+installfiles: $(F) installdirs
-+	$(INSTALL_DATA) ./libvpi.a "$(DESTDIR)$(libdir)/libvpi$(suffix).a"
- 	$(INSTALL_PROGRAM) ./system.vpi "$(DESTDIR)$(vpidir)/system.vpi"
--
--$(vpidir)/va_math.vpi: ./va_math.vpi
- 	$(INSTALL_PROGRAM) ./va_math.vpi "$(DESTDIR)$(vpidir)/va_math.vpi"
--
--$(vpidir)/v2005_math.vpi: ./v2005_math.vpi
- 	$(INSTALL_PROGRAM) ./v2005_math.vpi "$(DESTDIR)$(vpidir)/v2005_math.vpi"
--
--$(vpidir)/v2009.vpi: ./v2009.vpi
- 	$(INSTALL_PROGRAM) ./v2009.vpi "$(DESTDIR)$(vpidir)/v2009.vpi"
--
--$(vpidir)/vhdl_sys.vpi: ./vhdl_sys.vpi
- 	$(INSTALL_PROGRAM) ./vhdl_sys.vpi "$(DESTDIR)$(vpidir)/vhdl_sys.vpi"
--
--$(vpidir)/vhdl_textio.vpi: ./vhdl_textio.vpi
- 	$(INSTALL_PROGRAM) ./vhdl_textio.vpi "$(DESTDIR)$(vpidir)/vhdl_textio.vpi"
--
--$(vpidir)/vpi_debug.vpi: ./vpi_debug.vpi
- 	$(INSTALL_PROGRAM) ./vpi_debug.vpi "$(DESTDIR)$(vpidir)/vpi_debug.vpi"
- 
- installdirs: $(srcdir)/../mkinstalldirs
---- a/vvp/Makefile.in
-+++ b/vvp/Makefile.in
-@@ -162,18 +162,18 @@ vvp.pdf: vvp.ps
- 
- ifeq (@MINGW32@,yes)
- ifeq ($(MAN),none)
--INSTALL_DOC = $(mandir)/man1/vvp$(suffix).1
-+INSTALL_DOC = installman
- else
- ifeq ($(PS2PDF),none)
--INSTALL_DOC = $(mandir)/man1/vvp$(suffix).1
-+INSTALL_DOC = installman
- else
--INSTALL_DOC = $(prefix)/vvp$(suffix).pdf $(mandir)/man1/vvp$(suffix).1
-+INSTALL_DOC = installpdf installman
- all: vvp.pdf
- endif
- endif
- INSTALL_DOCDIR = $(mandir)/man1
- else
--INSTALL_DOC = $(mandir)/man1/vvp$(suffix).1
-+INSTALL_DOC = installman
- INSTALL_DOCDIR = $(mandir)/man1
- endif
- 
-@@ -182,17 +182,19 @@ stamp-config-h: $(srcdir)/config.h.in ../config.status
- 	cd ..; ./config.status --header=vvp/config.h
- config.h: stamp-config-h
- 
--install: all installdirs $(bindir)/vvp$(suffix)@EXEEXT@ $(INSTALL_DOC)
-+install: all installdirs installfiles
- 
--$(bindir)/vvp$(suffix)@EXEEXT@: ./vvp@EXEEXT@
--	$(INSTALL_PROGRAM) ./vvp@EXEEXT@ "$(DESTDIR)$(bindir)/vvp$(suffix)@EXEEXT@"
-+F = ./vvp@EXEEXT@ $(INSTALL_DOC)
- 
--$(mandir)/man1/vvp$(suffix).1: vvp.man
-+installman: vvp.man installdirs
- 	$(INSTALL_DATA) vvp.man "$(DESTDIR)$(mandir)/man1/vvp$(suffix).1"
- 
--$(prefix)/vvp$(suffix).pdf: vvp.pdf
-+installpdf: vvp.pdf installdirs
- 	$(INSTALL_DATA) vvp.pdf "$(DESTDIR)$(prefix)/vvp$(suffix).pdf"
- 
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./vvp@EXEEXT@ "$(DESTDIR)$(bindir)/vvp$(suffix)@EXEEXT@"
-+
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(INSTALL_DOCDIR)"
- 

diff --git a/sci-electronics/iverilog/iverilog-9999.ebuild b/sci-electronics/iverilog/iverilog-9999.ebuild
index 74c2574d0ab..0ed7834f3f0 100644
--- a/sci-electronics/iverilog/iverilog-9999.ebuild
+++ b/sci-electronics/iverilog/iverilog-9999.ebuild
@@ -40,10 +40,6 @@ DEPEND="
 	${RDEPEND}
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-file-missing.patch #705412
-)
-
 src_prepare() {
 	default
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/iverilog/, sci-electronics/iverilog/files/
@ 2020-09-14 18:26 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2020-09-14 18:26 UTC (permalink / raw
  To: gentoo-commits

commit:     c993d8bd5997e5003f88fbffdaac2906db963fae
Author:     Felix Neumärker <xdch47 <AT> posteo <DOT> de>
AuthorDate: Fri Sep  4 16:50:50 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 18:26:03 2020 +0000
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 <xdch47 <AT> posteo.de>
Signed-off-by: Sam James <sam <AT> 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 00000000000..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 <h.zeller@acm.org>
+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 <h.zeller@acm.org>
+---
+ 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 00000000000..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} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git"
+else
+	SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/${PN}-${GITHUB_PV}"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="examples"
+
+# If you are building from git, you will also need gperf to generate
+# the configure scripts.
+RDEPEND="
+	sys-libs/readline:=
+	sys-libs/zlib
+"
+
+DEPEND="
+	dev-util/gperf
+	sys-devel/bison
+	sys-devel/flex
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3-file-missing.patch #705412
+	"${FILESDIR}"/${PN}-10.3-fno-common.patch #706366
+	"${FILESDIR}"/${PN}-10.3-gen-bison-header.patch #734760
+)
+
+src_prepare() {
+	default
+
+	# From upstreams autoconf.sh, to make it utilize the autotools eclass
+	# Here translate the autoconf.sh, equivalent to the following code
+	# > sh autoconf.sh
+
+	# Autoconf in root ...
+	eautoconf --force
+	# Precompiling lexor_keyword.gperf
+	gperf -o -i 7 -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc || die
+	# Precompiling vhdlpp/lexor_keyword.gperf
+	cd vhdlpp || die
+	gperf -o -i 7 --ignore-case -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc || die
+}
+
+src_install() {
+	local DOCS=( *.txt )
+	# Default build fails with parallel jobs,
+	# https://github.com/steveicarus/iverilog/pull/294
+	emake installdirs DESTDIR="${D}"
+	default
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/iverilog/, sci-electronics/iverilog/files/
@ 2022-04-27 13:19 Joonas Niilola
  0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2022-04-27 13:19 UTC (permalink / raw
  To: gentoo-commits

commit:     15bc4ddeb0d78cf15632d7d9247532f295943602
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Mon Apr 25 11:04:38 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 13:18:57 2022 +0000
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 <vowstar <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25191
Signed-off-by: Joonas Niilola <juippis <AT> 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 000000000000..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 <vowstar@gmail.com>
+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 <vowstar@gmail.com>
+---
+ 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 <vowstar@gmail.com>
+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 <vowstar@gmail.com>
+---
+ 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 000000000000..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: $(srcdir)/configure
\ No newline at end of file

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 000000000000..0027184c8338
--- /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 <h.zeller@acm.org>
+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 <h.zeller@acm.org>
+---
+ 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/files/iverilog-10.3-override-var.patch b/sci-electronics/iverilog/files/iverilog-10.3-override-var.patch
new file mode 100644
index 000000000000..93b9a616987d
--- /dev/null
+++ b/sci-electronics/iverilog/files/iverilog-10.3-override-var.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/730096
+--- a/vpi/Makefile.in	2022-04-25 18:39:03.748939186 +0800
++++ b/vpi/Makefile.in	2022-04-25 18:38:43.754679053 +0800
+@@ -71,7 +71,7 @@
+ M = sys_clog2.o v2005_math.o
+ 
+ # Object files for va_math.vpi
+-V = va_math.o
++override V = va_math.o
+ 
+ V2009 = v2009_table.o v2009_array.o v2009_enum.o v2009_string.o
+ 

diff --git a/sci-electronics/iverilog/iverilog-10.3.ebuild b/sci-electronics/iverilog/iverilog-10.3.ebuild
index 1a2a537efa44..a0e95ea74ac9 100644
--- a/sci-electronics/iverilog/iverilog-10.3.ebuild
+++ b/sci-electronics/iverilog/iverilog-10.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -26,23 +26,25 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="examples"
 
-# If you are building from git, you will also need gperf to generate
-# the configure scripts.
-RDEPEND="
-	sys-libs/readline:0
+# 721022, should depend on sys-libs/readline:=
+DEPEND="
+	sys-libs/readline:=
 	sys-libs/zlib
 "
-
-DEPEND="
+RDEPEND="${DEPEND}"
+BDEPEND="
 	dev-util/gperf
 	sys-devel/bison
 	sys-devel/flex
-	${RDEPEND}
 "
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3-file-missing.patch #705412
 	"${FILESDIR}"/${PN}-10.3-fno-common.patch #706366
+	"${FILESDIR}"/${PN}-10.3-gen-bison-header.patch #734760
+	"${FILESDIR}"/${PN}-10.3-call-nm.patch #731906
+	"${FILESDIR}"/${PN}-10.3-configure-ac.patch #426262
+	"${FILESDIR}"/${PN}-10.3-override-var.patch #730096
 )
 
 src_prepare() {
@@ -52,6 +54,9 @@ src_prepare() {
 	# Here translate the autoconf.sh, equivalent to the following code
 	# > sh autoconf.sh
 
+	# Move configure.in to configure.ac (bug #426262)
+	mv configure.in configure.ac || die
+
 	# Autoconf in root ...
 	eautoconf --force
 	# Precompiling lexor_keyword.gperf


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-04-27 13:19 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-30  6:33 [gentoo-commits] repo/gentoo:master commit in: sci-electronics/iverilog/, sci-electronics/iverilog/files/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2020-01-30  6:33 Joonas Niilola
2020-02-17  7:23 Sergei Trofimovich
2020-03-08 12:58 Joonas Niilola
2020-09-14 18:26 Sam James
2022-04-27 13:19 Joonas Niilola

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox