update to 0.17 snapshot (BZ 2083221)

.gitignore

@@ -3,3 +3,16 @@
 /yosys-0.8.tar.gz
 /yosys-0.9.tar.gz
 /yosys_0.9-1.debian.tar.xz
+/yosys-9cdc6b5.tar.gz
+/yosys-26e01a6.tar.gz
+/yosys-df2b79c.tar.gz
+/yosys-50be8fd.tar.gz
+/yosys-62739f7.tar.gz
+/yosys-9a41380.tar.gz
+/yosys-cdb5711.tar.gz
+/yosys-84f0df1.tar.gz
+/yosys-0e97c3f.tar.gz
+/yosys-a41c1df.tar.gz
+/yosys-c312402.tar.gz
+/yosys-4da3f28.tar.gz
+/yosys-587e09d.tar.gz

sources

@@ -1,2 +1,2 @@
-SHA512 (yosys-0.9.tar.gz) = 6ae0f822ca0e3ec749773dae89e948488b698aaa149e73f04604dd899ac403a3073645f0e27382801f5f1a9483d87ef4066fde5dc797181eff06684de7a5b138
+SHA512 (yosys-587e09d.tar.gz) = 5cafa2dab54a93a2142f632c84900eee48049405bdbd04f09cd21ff580cd1070173906c40b37f56257535ec3b09935ed81f0783b45b72153f5179fc001d0a1a0
 SHA512 (yosys_0.9-1.debian.tar.xz) = d9df5637efc730b2b681daa8a5933803dba70dca5b31fe4ac13601032eccd9105c001563cf627fbdd2d4ebad8551f2647e882fbf107a7df98badb2d200e2b4dc

yosys-cfginc.patch

@@ -1,11 +1,25 @@
---- yosys-yosys-0.8/Makefile~	2018-10-16 15:22:16.000000000 +0100
-+++ yosys-yosys-0.8/Makefile	2018-10-27 19:11:12.815856126 +0100
-@@ -520,7 +520,7 @@
+diff --git a/Makefile b/Makefile
+index cd617987..9c13548a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -702,7 +702,7 @@ LDLIBS_NOVERIFIC = $(LDLIBS)
  endif
  
- yosys-config: misc/yosys-config.in
+ $(PROGRAM_PREFIX)yosys-config: misc/yosys-config.in
 -	$(P) $(SED) -e 's#@CXXFLAGS@#$(subst -I. -I"$(YOSYS_SRC)",-I"$(DATDIR)/include",$(strip $(CXXFLAGS_NOVERIFIC)))#;' \
 +	$(P) $(SED) -e 's#@CXXFLAGS@#$(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))#;' \
- 			-e 's#@BINDIR@#$(strip $(BINDIR))#;' -e 's#@DATDIR@#$(strip $(DATDIR))#;' < $< > yosys-config
- 	$(Q) chmod +x yosys-config
+ 			-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
+index 2880c8c0..a32f11a1 100644
+--- a/tests/various/plugin.sh
++++ b/tests/various/plugin.sh
+@@ -3,6 +3,6 @@ rm -f plugin.so
+ CXXFLAGS=$(../../yosys-config --cxxflags)
+ DATDIR=$(../../yosys-config --datdir)
+ DATDIR=${DATDIR//\//\\\/}
+-CXXFLAGS=${CXXFLAGS//$DATDIR/..\/..\/share}
++CXXFLAGS=${CXXFLAGS//\/usr\/include\/yosys/..\/..\/share\/include}
+ ../../yosys-config --exec --cxx ${CXXFLAGS} --ldflags -shared -o plugin.so plugin.cc
+ ../../yosys -m ./plugin.so -p "test" | grep -q "Plugin test passed!"

yosys-gcc11.patch

@@ -1,12 +0,0 @@
-diff --git a/passes/sat/freduce.cc b/passes/sat/freduce.cc
-index f296316..292097c 100644
---- a/passes/sat/freduce.cc
-+++ b/passes/sat/freduce.cc
-@@ -27,6 +27,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <algorithm>
-+#include <limits>
- 
- USING_YOSYS_NAMESPACE
- PRIVATE_NAMESPACE_BEGIN

yosys-mancfginc.patch

@@ -1,6 +1,7 @@
-diff -up yosys-5199aafca0579aceb3b4a2ad1af610bcb4ccfcd1/manual/CHAPTER_Prog/Makefile.mancfginc yosys-5199aafca0579aceb3b4a2ad1af610bcb4ccfcd1/manual/CHAPTER_Prog/Makefile
---- yosys-5199aafca0579aceb3b4a2ad1af610bcb4ccfcd1/manual/CHAPTER_Prog/Makefile.mancfginc	2016-09-10 08:24:08.000000000 -0600
-+++ yosys-5199aafca0579aceb3b4a2ad1af610bcb4ccfcd1/manual/CHAPTER_Prog/Makefile	2016-09-13 03:52:13.236296221 -0600
+diff --git a/manual/CHAPTER_Prog/Makefile b/manual/CHAPTER_Prog/Makefile
+index 8e326bdc..5c15c6bb 100644
+--- a/manual/CHAPTER_Prog/Makefile
++++ b/manual/CHAPTER_Prog/Makefile
 @@ -5,7 +5,7 @@ test: stubnets.so
  	tail test1.log test2.log test3.log
  
@@ -10,15 +11,16 @@ diff -up yosys-5199aafca0579aceb3b4a2ad1af610bcb4ccfcd1/manual/CHAPTER_Prog/Make
  
  clean:
  	rm -f test1.log test2.log test3.log
-diff -up yosys-5199aafca0579aceb3b4a2ad1af610bcb4ccfcd1/manual/PRESENTATION_Prog/Makefile.mancfginc yosys-5199aafca0579aceb3b4a2ad1af610bcb4ccfcd1/manual/PRESENTATION_Prog/Makefile
---- yosys-5199aafca0579aceb3b4a2ad1af610bcb4ccfcd1/manual/PRESENTATION_Prog/Makefile.mancfginc	2016-09-13 03:47:52.222413004 -0600
-+++ yosys-5199aafca0579aceb3b4a2ad1af610bcb4ccfcd1/manual/PRESENTATION_Prog/Makefile	2016-09-13 03:50:38.875169350 -0600
-@@ -2,7 +2,7 @@
- all: test0.log test1.log test2.log
+diff --git a/manual/PRESENTATION_Prog/Makefile b/manual/PRESENTATION_Prog/Makefile
+index 7e3cf814..226b023d 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)
  
  my_cmd.so: my_cmd.cc
--	../../yosys-config --exec --cxx --cxxflags --ldflags -o my_cmd.so -shared my_cmd.cc --ldlibs
-+	../../yosys-config --exec --cxx --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.spec

@@ -1,20 +1,18 @@
-#%%global commit0 8a4c6e6563eea979dc96cada14abb08d63a8e3d1
-#%%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
+%global commit0 587e09d551d753d6c9a3ca3635e2c7f66e978024
+%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
 
-#%%global snapdate 20190826
+%global snapdate 20220509
 
 %global __python %{__python3}
 
 Name:           yosys
-Version:        0.9
-Release:        9%{?dist}
-#Release:        1.1.%%{snapdate}git%%{shortcommit0}%%{?dist}
+Version:        0.17
+Release:        1.%{snapdate}git%{shortcommit0}%{?dist}
 Summary:        Yosys Open SYnthesis Suite, including Verilog synthesizer
 License:        ISC and MIT
 URL:            http://www.clifford.at/yosys/
 
-Source0:        https://github.com/YosysHQ/%{name}/archive/%{name}-%{version}.tar.gz
-#Source0:        https://github.com/YosysHQ/%%{name}/archive/%%{commit0}/%%{name}-%%{shortcommit0}.tar.gz
+Source0:        https://github.com/YosysHQ/%{name}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
 Source1:        https://github.com/mdaines/viz.js/releases/download/0.0.3/viz.js
 
 # man pages written for Debian:
@@ -33,10 +31,7 @@ Patch1:         yosys-cfginc.patch
 # filesystem.
 Patch2:         yosys-mancfginc.patch
 
-# Fix missing #includes caught by gcc-11
-Patch3:         %{name}-gcc11.patch
-
-BuildRequires: make
+BuildRequires:  make
 BuildRequires:  gcc-c++
 BuildRequires:  bison flex readline-devel pkgconfig
 BuildRequires:  tcl-devel libffi-devel
@@ -58,6 +53,8 @@ Requires:       %{name}-share = %{version}-%{release}
 Requires:       graphviz python-xdot
 Requires:       abc >= 1.01-9
 
+# abc use broken on all Big Endian CPUs, specifically s390x (see BZ 1937362, 1937395):
+ExcludeArch: s390x
 
 %description
 Yosys is a framework for Verilog RTL synthesis. It currently has
@@ -90,22 +87,18 @@ Development files to build Yosys synthesizer plugins.
 
 
 %prep
-%setup -q -n %{name}-%{name}-%{version}
-#%%setup -q -n %%{name}-%%{commit0}
+%setup -q -n %{name}-%{commit0}
 
 %patch1 -p1 -b .cfginc
 %patch2 -p1 -b .mancfginc
-%patch3 -p1 -b .gcc11
 
 # Ensure that Makefile doesn't wget viz.js
 cp %{SOURCE1} .
 
 # Get man pages from Debian
-%setup -q -T -D -a 2 -n %{name}-%{name}-%{version}
-#%%setup -q -T -D -a 2 -n %%{name}-%%{commit0}
+%setup -q -T -D -a 2 -n %{name}-%{commit0}
 
-# In all Python shebang lines, remove use of /usr/bin/env,
-# without changing timestamps
+# Remove '/usr/bin/env', without changing timestamps, in all python shebangs:
 for f in `find . -name \*.py`
 do
     sed 's|/usr/bin/env python3|/usr/bin/python3|' $f >$f.new
@@ -115,8 +108,7 @@ done
 
 make config-gcc
 
-# Change manual source files to use libertine font rather than non-free
-# luximono
+# 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
@@ -127,7 +119,9 @@ done
 # disable LTO to allow building for f33 rawhide (BZ 1865657):
 %define _lto_cflags %{nil}
 %set_build_flags
-make %{?_smp_mflags} PREFIX="%{_prefix}" ABCEXTERNAL=%{_bindir}/abc PRETTY=0 all manual
+make %{?_smp_mflags} PREFIX="%{_prefix}" ABCEXTERNAL=%{_bindir}/abc PRETTY=0 all
+#manual
+touch manual/empty.pdf
 
 %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
@@ -177,6 +171,62 @@ make test ABCEXTERNAL=%{_bindir}/abc SEED=314159265359
 
 
 %changelog
+* Mon May 09 2022 Gabriel Somlo <gsomlo@gmail.com> - 0.17.1.20220509git587e09d
+- update to 0.17 snapshot
+
+* Thu Apr 07 2022 Gabriel Somlo <gsomlo@gmail.com> - 0.16.1.20220407git4da3f28
+- update to 0.16 snapshot
+
+* Fri Mar 04 2022 Gabriel Somlo <gsomlo@gmail.com> - 0.15.1.20220304gitc312402
+- update to 0.15 snapshot
+
+* Tue Feb 22 2022 Gabriel Somlo <gsomlo@gmail.com> - 0.14.1.20220222gita41c1df
+- update to 0.14 snapshot
+
+* Thu Jan 27 2022 Gabriel Somlo <gsomlo@gmail.com> - 0.13.2.20220127git0e97c3f
+- update to newer 0.13 snapshot
+- remove pdf manual patch (issue fixed upstream)
+
+* Thu Jan 27 2022 Gabriel Somlo <gsomlo@gmail.com> - 0.13.1.20220127git84f0df1
+- update to 0.13 snapshot (#2039600, #2047137)
+- patch to restore ability to build the .pdf manual (upstream PR #3156)
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.12- 3.20211209gitcdb5711
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 0.12-2.20211209gitcdb5711
+- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
+
+* Thu Dec 09 2021 Gabriel Somlo <gsomlo@gmail.com> - 0.12.1.20211209gitcdb5711
+- update to 0.12 snapshot (#2028824)
+
+* Sat Nov 06 2021 Gabriel Somlo <gsomlo@gmail.com> - 0.11.1.20211106git9a41380
+- update snapshot
+
+* Tue Sep 28 2021 Gabriel Somlo <gsomlo@gmail.com> - 0.10.1.20210928git62739f7
+- update snapshot
+
+* Sun Sep 05 2021 Gabriel Somlo <gsomlo@gmail.com> - 0.9.16.20210904git50be8fd
+- undo 'single thread to avoid race condition while building pdf doc'
+
+* Sun Sep 05 2021 Gabriel Somlo <gsomlo@gmail.com> - 0.9.15.20210904git50be8fd
+- use single thread to avoid race condition in pdf doc build
+
+* Sat Sep 04 2021 Gabriel Somlo <gsomlo@gmail.com> - 0.9.14.20210904git50be8fd
+- update snapshot
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-13.20210523gitdf2b79c
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sun May 23 2021 Gabriel Somlo <gsomlo@gmail.com> - 0.9.12.20210523gitdf2b79c
+- update snapshot
+
+* Wed Mar 10 2021 Gabriel Somlo <gsomlo@gmail.com> - 0.9-11.20210310git26e01a6
+- exclude arch s390x (abc use broken on all Big Endian CPUs, see BZ 1937362, 1937395)
+
+* Sun Mar 07 2021 Gabriel Somlo <gsomlo@gmail.com> - 0.9-10.20210307git9cdc6b5
+- Switch to snapshots (releases are too infrequent w.r.t. development speed)
+
 * Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild