From b08b4b7c6bafb6e4077e663546e725dacadf55de Mon Sep 17 00:00:00 2001
From: Gabriel L. Somlo <gsomlo@gmail.com>
Date: Aug 26 2019 13:00:58 +0000
Subject: update to latest release


---

diff --git a/.gitignore b/.gitignore
index fa6b58f..d15b7ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /yosys-0.7.tar.gz
 /yosys_0.7-2.debian.tar.xz
 /yosys-0.8.tar.gz
+/yosys-0.9.tar.gz
diff --git a/sources b/sources
index e525e40..eaac9ba 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (yosys-0.8.tar.gz) = 92364592f755b77bca5efaa99ed8050f4278a406066601a217c567e238ad2f59f9d85b7c91295dbd7125b2f9a0da74c511e238d8ae996bba1cd4aace71dc3d10
+SHA512 (yosys-0.9.tar.gz) = 6ae0f822ca0e3ec749773dae89e948488b698aaa149e73f04604dd899ac403a3073645f0e27382801f5f1a9483d87ef4066fde5dc797181eff06684de7a5b138
 SHA512 (yosys_0.7-2.debian.tar.xz) = a1ab0c600a1e7d22a121dcb9baaf41c40b4c5ddfe69d75c26bcdd45c17132fe218c08ad0e605f6cda26b3f00b62cc402382481eb6ef8186862b72bcc4ae70582
diff --git a/yosys-empty-label.patch b/yosys-empty-label.patch
deleted file mode 100644
index 253849b..0000000
--- a/yosys-empty-label.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 6732e566321b828c83b563d24a10ac31c6d03e28 Mon Sep 17 00:00:00 2001
-From: Jon Burgess <jburgess777@gmail.com>
-Date: Sun, 28 Oct 2018 14:49:09 +0000
-Subject: [PATCH] Avoid assert when label is an empty string
-
-Calling back() on an empty string is not allowed and triggers
-an assert with recent gcc:
-
-$ cd manual/PRESENTATION_Intro
-$ ../../yosys counter.ys
-...
-/usr/include/c++/8/bits/basic_string.h:1136: std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::reference std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::back() [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>; std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::reference = char&]: Assertion '!empty()' failed.
-
-802             if (label.back() == ':' && GetSize(label) > 1)
-(gdb) p label
-$1 = ""
----
- kernel/yosys.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kernel/yosys.cc b/kernel/yosys.cc
-index 21eeadaa..f002955a 100644
---- a/kernel/yosys.cc
-+++ b/kernel/yosys.cc
-@@ -799,7 +799,7 @@ static void handle_label(std::string &command, bool &from_to_active, const std::
- 	while (pos < GetSize(command) && command[pos] != ' ' && command[pos] != '\t' && command[pos] != '\r' && command[pos] != '\n')
- 		label += command[pos++];
- 
--	if (label.back() == ':' && GetSize(label) > 1)
-+	if (GetSize(label) > 1 && label.back() == ':')
- 	{
- 		label = label.substr(0, GetSize(label)-1);
- 		command = command.substr(pos);
--- 
-2.17.2
-
diff --git a/yosys.spec b/yosys.spec
index 8cdffe8..c898cf6 100644
--- a/yosys.spec
+++ b/yosys.spec
@@ -1,19 +1,20 @@
-#%global commit0 8f5bf6de32bcc478312d8f5410826b4894ebadba
+#%%global commit0 8a4c6e6563eea979dc96cada14abb08d63a8e3d1
+#%%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
 
-#%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+#%%global snapdate 20190826
 
 %global __python %{__python3}
 
 Name:           yosys
-Version:        0.8
-Release:        5%{?dist}
-# For git snapshot: 2.20160923git%{shortcommit0}%{?dist}
+Version:        0.9
+Release:        1%{?dist}
+#Release:        1.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/yosys/archive/yosys-0.8.tar.gz
-# For git snapshot: https://github.com/YosysHQ/%{name}/archive/%{commit0}.tar.gz
+Source0:        https://github.com/YosysHQ/%{name}/archive/%{name}-%{version}.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:
@@ -32,11 +33,6 @@ Patch1:         yosys-cfginc.patch
 # filesystem.
 Patch2:         yosys-mancfginc.patch
 
-# Fix assert with empty label
-# https://github.com/YosysHQ/yosys/pull/680
-Patch3:         yosys-empty-label.patch
-
-
 BuildRequires:  gcc-c++
 BuildRequires:  bison flex readline-devel pkgconfig
 BuildRequires:  tcl-devel libffi-devel
@@ -90,18 +86,17 @@ Development files to build Yosys synthesizer plugins.
 
 %prep
 %setup -q -n %{name}-%{name}-%{version}
-# For git snapshot: %setup -q -n %{name}-%{commit0}
+#%%setup -q -n %%{name}-%%{commit0}
 
 %patch1 -p1 -b .cfginc
 %patch2 -p1 -b .mancfginc
-%patch3 -p1 -b .label
 
 # 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}
-# For git snapshot: %setup -q -T -D -a 2 -n %{name}-%{commit0}
+#%%setup -q -T -D -a 2 -n %%{name}-%%{commit0}
 
 # Remove shebang from Python files that aren't executable,
 # without changing timestamps
@@ -184,6 +179,10 @@ make test ABCEXTERNAL=%{_bindir}/abc SEED=314159265359
 
 
 %changelog
+* Mon Aug 26 2019 Gabriel Somlo <gsomlo@gmail.com> - 0.9-1
+- Update to latest release
+- Spec file cleanup
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild