[yosys] 01/01: Remove two patches

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository yosys.

commit b4c3608f09bf10b172c909661cc9ed4166e94683
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Nov 3 22:47:52 2016 +0000

    Remove two patches
---
 debian/patches/add-missing-headers.patch           | 21 -------
 .../patches/fix_ftbfs_cannot_find_infinite.patch   | 64 ----------------------
 debian/patches/series                              |  2 -
 3 files changed, 87 deletions(-)

diff --git a/debian/patches/add-missing-headers.patch b/debian/patches/add-missing-headers.patch
deleted file mode 100644
index 839a906..0000000
--- a/debian/patches/add-missing-headers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Sebastian Kuzminsky <seb at highlab.com>
-Date: Sat, 14 May 2016 15:44:13 +0200
-Subject: Include all headers needed to build the yosys plugins.
-
-===================================================================
----
- Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile b/Makefile
-index cbbd878..caf0c18 100644
---- a/Makefile
-+++ b/Makefile
-@@ -292,6 +292,7 @@ $(eval $(call add_include_file,libs/sha1/sha1.h))
- $(eval $(call add_include_file,passes/fsm/fsmdata.h))
- $(eval $(call add_include_file,frontends/ast/ast.h))
- $(eval $(call add_include_file,backends/ilang/ilang_backend.h))
-+$(eval $(call add_include_file,frontends/ast/ast.h))
- 
- OBJS += kernel/driver.o kernel/register.o kernel/rtlil.o kernel/log.o kernel/calc.o kernel/yosys.o
- OBJS += kernel/cellaigs.o kernel/celledges.o
diff --git a/debian/patches/fix_ftbfs_cannot_find_infinite.patch b/debian/patches/fix_ftbfs_cannot_find_infinite.patch
deleted file mode 100644
index b31963f..0000000
--- a/debian/patches/fix_ftbfs_cannot_find_infinite.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Ruben Undheim <ruben.undheim at gmail.com>
-Date: Sat, 14 May 2016 15:44:13 +0200
-Subject: This patch fixes an FTBFS due to std::infinite not available
-
-Bug-Debian: https://bugs.debian.org/822408
----
- frontends/ast/ast.cc | 4 ----
- passes/cmds/qwp.cc   | 7 ++++---
- 2 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc
-index 92513a2..01608d8 100644
---- a/frontends/ast/ast.cc
-+++ b/frontends/ast/ast.cc
-@@ -873,11 +873,7 @@ RTLIL::Const AstNode::realAsConst(int width)
- {
- 	double v = round(realvalue);
- 	RTLIL::Const result;
--#ifdef EMSCRIPTEN
- 	if (!isfinite(v)) {
--#else
--	if (!std::isfinite(v)) {
--#endif
- 		result.bits = std::vector<RTLIL::State>(width, RTLIL::State::Sx);
- 	} else {
- 		bool is_negative = v < 0;
-diff --git a/passes/cmds/qwp.cc b/passes/cmds/qwp.cc
-index 1b800b6..c6e0573 100644
---- a/passes/cmds/qwp.cc
-+++ b/passes/cmds/qwp.cc
-@@ -19,6 +19,7 @@
- 
- #include "kernel/yosys.h"
- #include "kernel/sigtools.h"
-+#include <math.h>
- 
- #undef LOG_MATRICES
- #undef PYPLOT_EDGES
-@@ -364,7 +365,7 @@ struct QwpWorker
- 			double c = alt_mode ? alt_midpos : midpos;
- 			double r = alt_mode ? alt_radius : radius;
- 
--			if (std::isfinite(v)) {
-+			if (isfinite(v)) {
- 				v = min(v, c+r);
- 				v = max(v, c-r);
- 			} else {
-@@ -546,14 +547,14 @@ struct QwpWorker
- 			double rel_pos = node.pos - median;
- 			if (rel_pos < 0) {
- 				node.pos = midpos + left_scale*rel_pos;
--				if (std::isfinite(node.pos)) {
-+				if (isfinite(node.pos)) {
- 					node.pos = min(node.pos, midpos);
- 					node.pos = max(node.pos, midpos - radius);
- 				} else
- 					node.pos = midpos - radius/2;
- 			} else {
- 				node.pos = midpos + right_scale*rel_pos;
--				if (std::isfinite(node.pos)) {
-+				if (isfinite(node.pos)) {
- 					node.pos = max(node.pos, midpos);
- 					node.pos = min(node.pos, midpos + radius);
- 				} else
diff --git a/debian/patches/series b/debian/patches/series
index dd921c6..d0361e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,4 @@
 05_abc_executable.patch
 switch-to-free-font.patch
 manual-build.patch
-add-missing-headers.patch
 kfreebsd-support.patch
-fix_ftbfs_cannot_find_infinite.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/yosys.git