diff --git a/.gitignore b/.gitignore index b862a96..d9fcfd6 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /yosys-62739f7.tar.gz /yosys-9a41380.tar.gz /yosys-cdb5711.tar.gz +/yosys-84f0df1.tar.gz diff --git a/sources b/sources index 424f61b..8e48447 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (yosys-cdb5711.tar.gz) = 224dda7c783e2f6db8a281beb05229e89fd4bcc53ff4098dc2820a9cafba520f8ae2cd63851bc773b2e394c30ada5fed799b7d49fb818797affe91ed37cbe4f1 +SHA512 (yosys-84f0df1.tar.gz) = 5b04fa1d1449d4261996893bcbc8784e328f86a3eab99f2cf33ace52d45874f88e11c1f04b5b43bf4646a89429c29dfd3fd3ab35fb54dda7d98ef87e7eeed0d3 SHA512 (yosys_0.9-1.debian.tar.xz) = d9df5637efc730b2b681daa8a5933803dba70dca5b31fe4ac13601032eccd9105c001563cf627fbdd2d4ebad8551f2647e882fbf107a7df98badb2d200e2b4dc diff --git a/yosys-v13-revert-0cbdb42dc.patch b/yosys-v13-revert-0cbdb42dc.patch new file mode 100644 index 0000000..018afcc --- /dev/null +++ b/yosys-v13-revert-0cbdb42dc.patch @@ -0,0 +1,48 @@ +From 40d84f62f80c311a11f13977575b399c54b76c88 Mon Sep 17 00:00:00 2001 +From: Gabriel Somlo +Date: Sun, 16 Jan 2022 15:01:55 -0500 +Subject: [PATCH] Revert "Use "read" command to parse HDL files from Yosys + command-line" + +This reverts commit 0cbdb42dcd74090296aa3fe6bf11db1c288d9962. +--- + kernel/yosys.cc | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/kernel/yosys.cc b/kernel/yosys.cc +index 102f9e737..0c1ee442e 100644 +--- a/kernel/yosys.cc ++++ b/kernel/yosys.cc +@@ -966,11 +966,11 @@ bool run_frontend(std::string filename, std::string command, RTLIL::Design *desi + if (filename_trim.size() > 3 && filename_trim.compare(filename_trim.size()-3, std::string::npos, ".gz") == 0) + filename_trim.erase(filename_trim.size()-3); + if (filename_trim.size() > 2 && filename_trim.compare(filename_trim.size()-2, std::string::npos, ".v") == 0) +- command = " -vlog2k"; ++ command = "verilog"; + else if (filename_trim.size() > 2 && filename_trim.compare(filename_trim.size()-3, std::string::npos, ".sv") == 0) +- command = " -sv"; ++ command = "verilog -sv"; + else if (filename_trim.size() > 3 && filename_trim.compare(filename_trim.size()-4, std::string::npos, ".vhd") == 0) +- command = " -vhdl"; ++ command = "vhdl"; + else if (filename_trim.size() > 4 && filename_trim.compare(filename_trim.size()-5, std::string::npos, ".blif") == 0) + command = "blif"; + else if (filename_trim.size() > 5 && filename_trim.compare(filename_trim.size()-6, std::string::npos, ".eblif") == 0) +@@ -1070,11 +1070,9 @@ bool run_frontend(std::string filename, std::string command, RTLIL::Design *desi + log("\n-- Parsing `%s' using frontend `%s' --\n", filename.c_str(), command.c_str()); + } + +- if (command[0] == ' ') { +- auto argv = split_tokens("read" + command); +- argv.push_back(filename); +- Pass::call(design, argv); +- } else ++ if (command == "tcl") ++ Pass::call(design, vector({command, filename})); ++ else + Frontend::frontend_call(design, NULL, filename, command); + + design->check(); +-- +2.31.1 + diff --git a/yosys.spec b/yosys.spec index a1e1d72..5350432 100644 --- a/yosys.spec +++ b/yosys.spec @@ -1,13 +1,13 @@ -%global commit0 cdb57118758f855518ad416d12728d72bff58c10 +%global commit0 84f0df1c9590572f339b62c8210837f01a024c76 %global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7}) -%global snapdate 20211209 +%global snapdate 20220127 %global __python %{__python3} Name: yosys -Version: 0.12 -Release: 3.%{snapdate}git%{shortcommit0}%{?dist} +Version: 0.13 +Release: 1.%{snapdate}git%{shortcommit0}%{?dist} Summary: Yosys Open SYnthesis Suite, including Verilog synthesizer License: ISC and MIT URL: http://www.clifford.at/yosys/ @@ -31,6 +31,11 @@ Patch1: yosys-cfginc.patch # filesystem. Patch2: yosys-mancfginc.patch +# Temporary fedora patch: +# revert commit 0cbdb42dc to allow `make manual` to successfully build a .pdf +# (see https://github.com/YosysHQ/yosys/issues/3156) +Patch3: yosys-v13-revert-0cbdb42dc.patch + BuildRequires: make BuildRequires: gcc-c++ BuildRequires: bison flex readline-devel pkgconfig @@ -91,6 +96,7 @@ Development files to build Yosys synthesizer plugins. %patch1 -p1 -b .cfginc %patch2 -p1 -b .mancfginc +%patch3 -p1 -b .manbuild # Ensure that Makefile doesn't wget viz.js cp %{SOURCE1} . @@ -119,7 +125,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 @@ -169,7 +177,11 @@ make test ABCEXTERNAL=%{_bindir}/abc SEED=314159265359 %changelog -* Sat Jan 22 2022 Fedora Release Engineering - 0.12-3.20211209gitcdb5711 +* Thu Jan 27 2022 Gabriel Somlo - 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 - 0.12- 3.20211209gitcdb5711 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild * Sat Jan 08 2022 Miro HronĨok - 0.12-2.20211209gitcdb5711