update to 0.40

.gitignore

@@ -24,3 +24,18 @@
 /yosys-c75f12a.tar.gz
 /yosys-7ad7b55.tar.gz
 /yosys-7bac192.tar.gz
+/yosys-1c667fa.tar.gz
+/yosys-b58664d.tar.gz
+/yosys-51dd029.tar.gz
+/yosys-d82bae3.tar.gz
+/yosys-5813809.tar.gz
+/yosys-b04d0e0.tar.gz
+/yosys-389b8d0.tar.gz
+/yosys-05f0262.tar.gz
+/yosys-8367f06.tar.gz
+/yosys-5691cd0.tar.gz
+/yosys-d87bd7c.tar.gz
+/yosys-6a7fad4.tar.gz
+/yosys-ac0fb2e.tar.gz
+/yosys-b3124f3.tar.gz
+/yosys-47bdb3e.tar.gz

sources

@@ -1,2 +1,2 @@
-SHA512 (yosys-7bac192.tar.gz) = 719aba7cc2afc362a754292f8139222281ddc56589ed6a966e91ff2baaa6b00a0a969fe50fac318d4d5d297147e04f4aad3ea75302ebed1dd3852ac3e980cf51
+SHA512 (yosys-47bdb3e.tar.gz) = 49d0877f86ecd43fc958f95800bc5e2449f91e356f0d97d1e1c75e3bfddcf31e72a91f3b34ab600a16f221e9d087c00d16919ff5f53d03f42ea616ef3b159b3a
 SHA512 (yosys_0.9-1.debian.tar.xz) = d9df5637efc730b2b681daa8a5933803dba70dca5b31fe4ac13601032eccd9105c001563cf627fbdd2d4ebad8551f2647e882fbf107a7df98badb2d200e2b4dc

yosys-cfginc.patch

@@ -1,14 +1,14 @@
 diff --git a/Makefile b/Makefile
-index b282dc6c6..8f02329bc 100644
+index 6d7bb2cec..13ee0bbb3 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -790,7 +790,7 @@ LDLIBS_NOVERIFIC = $(LDLIBS)
+@@ -784,7 +784,7 @@ LIBS_NOVERIFIC = $(LIBS)
  endif
  
  $(PROGRAM_PREFIX)yosys-config: misc/yosys-config.in
 -	$(P) $(SED) -e 's#@CXXFLAGS@#$(subst -Ilibs/dlfcn-win32,,$(subst -I. -I"$(YOSYS_SRC)",-I"$(DATDIR)/include",$(strip $(CXXFLAGS_NOVERIFIC))))#;' \
 +	$(P) $(SED) -e 's#@CXXFLAGS@#$(subst -Ilibs/dlfcn-win32,,$(subst -I. -I"$(YOSYS_SRC)",-I"$(PREFIX)/include/yosys",$(strip $(CXXFLAGS_NOVERIFIC))))#;' \
- 			-e 's#@CXX@#$(strip $(CXX))#;' -e 's#@LDFLAGS@#$(strip $(LDFLAGS) $(PLUGIN_LDFLAGS))#;' -e 's#@LDLIBS@#$(strip $(LDLIBS_NOVERIFIC) $(PLUGIN_LDLIBS))#;' \
+ 			-e 's#@CXX@#$(strip $(CXX))#;' -e 's#@LINKFLAGS@#$(strip $(LINKFLAGS) $(PLUGIN_LINKFLAGS))#;' -e 's#@LIBS@#$(strip $(LIBS_NOVERIFIC) $(PLUGIN_LIBS))#;' \
  			-e 's#@BINDIR@#$(strip $(BINDIR))#;' -e 's#@DATDIR@#$(strip $(DATDIR))#;' < $< > $(PROGRAM_PREFIX)yosys-config
  	$(Q) chmod +x $(PROGRAM_PREFIX)yosys-config
 diff --git a/tests/various/plugin.sh b/tests/various/plugin.sh

yosys-mancfginc.patch

@@ -1,26 +1,66 @@
-diff --git a/manual/PRESENTATION_Prog.tex b/manual/PRESENTATION_Prog.tex
-index b0390cb99..f2791c571 100644
---- a/manual/PRESENTATION_Prog.tex
-+++ b/manual/PRESENTATION_Prog.tex
-@@ -550,7 +550,7 @@ by loading plugins into Yosys.
- \bigskip
- Use the following command to compile a Yosys plugin:
- \begin{lstlisting}[xleftmargin=1cm, basicstyle=\ttfamily\fontsize{8pt}{10pt}\selectfont]
--yosys-config --exec --cxx --cxxflags --ldflags \
-+yosys-config --exec --cxx --cxxflags -I../.. --ldflags \
-              -o my_cmd.so -shared my_cmd.cc --ldlibs
- \end{lstlisting}
+diff --git a/Makefile b/Makefile
+index 13ee0bbb3..36c8f412a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1000,7 +1000,7 @@ docs/reqs:
+ 	$(Q) $(MAKE) -C docs reqs
  
-diff --git a/manual/PRESENTATION_Prog/Makefile b/manual/PRESENTATION_Prog/Makefile
-index 2ac8e5bed..64ed1c583 100644
---- a/manual/PRESENTATION_Prog/Makefile
-+++ b/manual/PRESENTATION_Prog/Makefile
-@@ -5,7 +5,7 @@ CXXFLAGS=$(shell ../../yosys-config --cxxflags)
- DATDIR=$(shell ../../yosys-config --datdir)
+ DOC_TARGET ?= html
+-docs: docs/source/cmd/abc.rst docs/gen_examples docs/gen_images docs/guidelines docs/usage docs/reqs
++docs: docs/source/cmd/abc.rst docs/gen_examples docs/gen_images docs/guidelines docs/usage
+ 	$(Q) $(MAKE) -C docs $(DOC_TARGET)
+ 
+ clean:
+diff --git a/docs/source/code_examples/extensions/Makefile b/docs/source/code_examples/extensions/Makefile
+index 288983ed3..9de4dd03a 100644
+--- a/docs/source/code_examples/extensions/Makefile
++++ b/docs/source/code_examples/extensions/Makefile
+@@ -10,7 +10,7 @@ CXXFLAGS=$(shell $(YOSYS)-config --cxxflags)
+ DATDIR=$(shell $(YOSYS)-config --datdir)
  
  my_cmd.so: my_cmd.cc
--	../../yosys-config --exec --cxx $(subst $(DATDIR),../../share,$(CXXFLAGS)) --ldflags -o my_cmd.so -shared my_cmd.cc --ldlibs
-+	../../yosys-config --exec --cxx $(subst $(DATDIR),../../share,$(CXXFLAGS)) -I../../ --ldflags -o my_cmd.so -shared my_cmd.cc --ldlibs
+-	$(YOSYS)-config --exec --cxx $(subst $(DATDIR),../../../../share,$(CXXFLAGS)) --ldflags -o my_cmd.so -shared my_cmd.cc --ldlibs
++	$(YOSYS)-config --exec --cxx $(subst $(DATDIR),../../../../share,$(CXXFLAGS)) -I../../../../ --ldflags -o my_cmd.so -shared my_cmd.cc --ldlibs
  
  test0.log: my_cmd.so
- 	../../yosys -Ql test0.log_new -m ./my_cmd.so -p 'my_cmd foo bar' absval_ref.v
+ 	$(YOSYS) -Ql test0.log_new -m ./my_cmd.so -p 'my_cmd foo bar' absval_ref.v
+diff --git a/docs/source/code_examples/extensions/my_cmd.cc b/docs/source/code_examples/extensions/my_cmd.cc
+index 36ddbe175..2ff77f6a1 100644
+--- a/docs/source/code_examples/extensions/my_cmd.cc
++++ b/docs/source/code_examples/extensions/my_cmd.cc
+@@ -1,5 +1,5 @@
+-#include "kernel/yosys.h"
+-#include "kernel/sigtools.h"
++#include <kernel/yosys.h>
++#include <kernel/sigtools.h>
+ 
+ USING_YOSYS_NAMESPACE
+ PRIVATE_NAMESPACE_BEGIN
+diff --git a/docs/source/code_examples/stubnets/Makefile b/docs/source/code_examples/stubnets/Makefile
+index ec501f006..1051a78ad 100644
+--- a/docs/source/code_examples/stubnets/Makefile
++++ b/docs/source/code_examples/stubnets/Makefile
+@@ -10,7 +10,7 @@ test: stubnets.so
+ 	tail test1.log test2.log test3.log
+ 
+ stubnets.so: stubnets.cc
+-	yosys-config --exec --cxx --cxxflags --ldflags -o $@ -shared $^ --ldlibs
++	yosys-config --exec --cxx --cxxflags -I../../../../ --ldflags -o $@ -shared $^ --ldlibs
+ 
+ .PHONY: clean
+ clean:
+diff --git a/docs/source/code_examples/stubnets/stubnets.cc b/docs/source/code_examples/stubnets/stubnets.cc
+index 566d24b18..b09bc567c 100644
+--- a/docs/source/code_examples/stubnets/stubnets.cc
++++ b/docs/source/code_examples/stubnets/stubnets.cc
+@@ -5,8 +5,8 @@
+ // binary, for any purpose, commercial or non-commercial, and by any
+ // means.
+ 
+-#include "kernel/yosys.h"
+-#include "kernel/sigtools.h"
++#include <kernel/yosys.h>
++#include <kernel/sigtools.h>
+ 
+ #include <string>
+ #include <map>

yosys.spec

@@ -1,13 +1,13 @@
-%global commit0 7bac1920b28672ba125aba991f30debae1cc0d8f
+%global commit0 47bdb3e32f71add7a48ec6215e9838048d52609a
 %global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
 
-%global snapdate 20230104
+%global snapdate 20240411
 
 %global __python %{__python3}
 
 Name:           yosys
-Version:        0.25
-Release:        2.%{snapdate}git%{shortcommit0}%{?dist}
+Version:        0.40
+Release:        1.%{snapdate}git%{shortcommit0}%{?dist}
 Summary:        Yosys Open SYnthesis Suite, including Verilog synthesizer
 License:        ISC and MIT
 URL:            http://www.clifford.at/yosys/
@@ -26,7 +26,7 @@ Source2:        http://http.debian.net/debian/pool/main/y/yosys/yosys_0.9-1.debi
 Patch1:         yosys-cfginc.patch
 
 # Fedora-specific patch:
-# When invoking yosys-config for examples in "make manual", need to use
+# When invoking yosys-config for examples in "make docs", need to use
 # relative path for includes, as they're not installed in build host
 # filesystem.
 Patch2:         yosys-mancfginc.patch
@@ -35,24 +35,29 @@ BuildRequires:  make
 BuildRequires:  gcc-c++
 BuildRequires:  bison flex readline-devel pkgconfig
 BuildRequires:  tcl-devel libffi-devel
-BuildRequires:  abc >= 1.01-9
-BuildRequires:  iverilog
+BuildRequires:  yosyshq-abc >= 0.39
+BuildRequires:  iverilog >= 12.0
 BuildRequires:  python%{python3_pkgversion}
 BuildRequires:  txt2man
 
 # required for documentation:
-BuildRequires:  graphviz
-BuildRequires:  texlive-beamer
-BuildRequires:  texlive-collection-bibtexextra
-BuildRequires:  texlive-collection-fontsextra
-BuildRequires:  texlive-collection-latexextra
-BuildRequires:  texlive-collection-publishers
-BuildRequires:  texlive-collection-science
+BuildRequires: graphviz
+BuildRequires: latexmk
+BuildRequires: libfaketime
+BuildRequires: pdf2svg
+BuildRequires: python3-furo
+BuildRequires: python3-sphinx-latex
+BuildRequires: python3-sphinxcontrib-bibtex
+BuildRequires: texlive-comment
+BuildRequires: texlive-pgfplots
+BuildRequires: texlive-standalone
 
 Requires:       %{name}-share = %{version}-%{release}
 Requires:       graphviz python-xdot
-Requires:       abc >= 1.01-9
+Requires:       yosyshq-abc >= 0.31
 
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval :
+ExcludeArch: %{ix86}
 # abc use broken on all Big Endian CPUs, specifically s390x (see BZ 1937362, 1937395):
 ExcludeArch: s390x
 
@@ -89,8 +94,8 @@ Development files to build Yosys synthesizer plugins.
 %prep
 %setup -q -n %{name}-%{commit0}
 
-%patch1 -p1 -b .cfginc
-%patch2 -p1 -b .mancfginc
+%patch 1 -p1 -b .cfginc
+%patch 2 -p1 -b .mancfginc
 
 # Ensure that Makefile doesn't wget viz.js
 cp %{SOURCE1} .
@@ -108,12 +113,6 @@ done
 
 make config-gcc
 
-# Change manual source files to use libertine font rather than non-free luximono
-for f in `find manual -name \*.tex -exec grep -l {luximono} {} \;`
-do
-    sed -i 's|{luximono}|{libertine}|' $f
-done
-
 
 %build
 # disable LTO to allow building for f33 rawhide (BZ 1865657):
@@ -121,7 +120,7 @@ done
 %set_build_flags
 make %{?_smp_mflags} PREFIX="%{_prefix}" ABCEXTERNAL=%{_bindir}/abc PRETTY=0 all
 #manual
-touch manual/empty.pdf
+make ABCEXTERNAL=%{_bindir}/abc DOC_TARGET=latexpdf docs
 
 %global man_date "`stat -c %y debian/man/yosys-smtbmc.txt | awk '{ print $1 }'`"
 txt2man -d %{man_date} -t YOSYS-SMTBMC debian/man/yosys-smtbmc.txt >yosys-smtbmc.1
@@ -140,7 +139,8 @@ install -m 0644 yosys-smtbmc.1 debian/yosys{,-config,-filterlib}.1 %{buildroot}%
 
 # install documentation
 install -d -m0755 %{buildroot}%{_docdir}/%{name}
-install -m 0644 manual/*.pdf %{buildroot}%{_docdir}/%{name}
+install -m 0644 docs/build/latex/yosyshqyosys.pdf %{buildroot}%{_docdir}/%{name}
+
 
 %check
 make test ABCEXTERNAL=%{_bindir}/abc SEED=314159265359
@@ -172,6 +172,62 @@ make test ABCEXTERNAL=%{_bindir}/abc SEED=314159265359
 
 
 %changelog
+* Thu Apr 11 2024 Gabriel Somlo <gsomlo@gmail.com> - 0.40.1.20240411git47bdb3e
+- update to 0.40 snapshot
+- update documentation build process
+
+* Thu Mar 14 2024 Gabriel Somlo <gsomlo@gmail.com> - 0.39.1.20240314gitb3124f3
+- update to 0.39 snapshot
+
+* Sat Feb 10 2024 Gabriel Somlo <gsomlo@gmail.com> - 0.38.1.20240210gitac0fb2e
+- update to 0.38 snapshot
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.37-2.20240117git6a7fad4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jan 17 2024 Gabriel Somlo <gsomlo@gmail.com> - 0.37.1.20240117git6a7fad4
+- update to 0.37 snapshot
+
+* Mon Dec 18 2023 Gabriel Somlo <gsomlo@gmail.com> - 0.36.1.20231218gitd87bd7c
+- update to 0.36 snapshot
+
+* Wed Nov 08 2023 Gabriel Somlo <gsomlo@gmail.com> - 0.35.1.20231108git5691cd0
+- update to 0.35 snapshot
+
+* Fri Oct 06 2023 Gabriel Somlo <gsomlo@gmail.com> - 0.34.1.20231006git8367f06
+- update to 0.34 snapshot
+
+* Tue Sep 12 2023 Gabriel Somlo <gsomlo@gmail.com> - 0.33.1.20230905git05f0262
+- update to 0.33 snapshot
+
+* Wed Aug 09 2023 Gabriel Somlo <gsomlo@gmail.com> - 0.32.1.20230809git389b8d0
+- update to 0.32 snapshot
+- switch abc [build]requires to yosyshq-abc
+
+* Wed Aug 02 2023 Gabriel Somlo <gsomlo@gmail.com> - 0.31.2.20230729gitb04d0e0
+- drop i686 (https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval)
+
+* Sat Jul 29 2023 Gabriel Somlo <gsomlo@gmail.com> - 0.31.1.20230729gitb04d0e0
+- update to 0.31 snapshot
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-2.20230607git5813809
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jun 07 2023 Gabriel Somlo <gsomlo@gmail.com> - 0.30.1.20230607git5813809
+- update to 0.30 snapshot
+
+* Thu May 11 2023 Gabriel Somlo <gsomlo@gmail.com> - 0.29.1.20230511gitd82bae3
+- update to 0.29 snapshot
+
+* Sun Apr 23 2023 Gabriel Somlo <gsomlo@gmail.com> - 0.28.1.20230423git51dd029
+- update to 0.28 snapshot
+
+* Tue Mar 07 2023 Gabriel Somlo <gsomlo@gmail.com> - 0.27.1.20230307gitb58664d
+- update to 0.27 snapshot
+
+* Wed Feb 15 2023 Gabriel Somlo <gsomlo@gmail.com> - 0.26.1.20230215git1c667fa
+- update to 0.26 snapshot
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.25-2.20230104git7bac192
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild