[yosys] 06/57: Removed abc from the deb-package. (intend to create a separate for that one) Now building successfully on launchpad ppa

[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 e8c26807ccf02d38db9be8482df3d3a05c9fe7e0
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Apr 13 00:46:26 2014 +0200

    Removed abc from the deb-package. (intend to create a separate for that one)
    Now building successfully on launchpad ppa
---
 debian/changelog                |  2 +-
 debian/patches/installpath.diff | 13 +++++++++++++
 debian/patches/notruntests.diff | 32 ++++++++++++++++++++++++++++++++
 debian/patches/removeabc.diff   | 39 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  3 +++
 5 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index efe2eb8..23b3533 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-yosys (0.2.0+-1~precise) precise; urgency=low
+yosys (0.2.0+-4~precise) precise; urgency=low
 
   * First ubuntu package of yosys 
 
diff --git a/debian/patches/installpath.diff b/debian/patches/installpath.diff
new file mode 100644
index 0000000..dd4f7dc
--- /dev/null
+++ b/debian/patches/installpath.diff
@@ -0,0 +1,13 @@
+Index: yosys-0.2.0+/Makefile
+===================================================================
+--- yosys-0.2.0+.orig/Makefile	2014-04-12 21:45:48.687931939 +0200
++++ yosys-0.2.0+/Makefile	2014-04-12 22:23:18.635951058 +0200
+@@ -12,7 +12,7 @@
+ # other configuration flags
+ ENABLE_GPROF := 0
+ 
+-DESTDIR := /usr/local
++DESTDIR := /usr
+ INSTALL_SUDO :=
+ 
+ OBJS =
diff --git a/debian/patches/notruntests.diff b/debian/patches/notruntests.diff
new file mode 100644
index 0000000..6624e9a
--- /dev/null
+++ b/debian/patches/notruntests.diff
@@ -0,0 +1,32 @@
+Index: yosys-0.2.0+/Makefile
+===================================================================
+--- yosys-0.2.0+.orig/Makefile	2014-04-13 00:02:10.768001468 +0200
++++ yosys-0.2.0+/Makefile	2014-04-13 00:18:25.476009751 +0200
+@@ -157,12 +157,12 @@
+ yosys-abc: abc/abc-$(ABCREV)
+ 	cp abc/abc-$(ABCREV) yosys-abc
+ 
+-test: $(TARGETS) $(EXTRA_TARGETS)
+-	cd tests/simple && bash run-test.sh
+-	cd tests/hana && bash run-test.sh
+-	cd tests/asicworld && bash run-test.sh
+-	cd tests/techmap && bash run-test.sh
+-	cd tests/sat && bash run-test.sh
++#test: $(TARGETS) $(EXTRA_TARGETS)
++#	cd tests/simple && bash run-test.sh
++#	cd tests/hana && bash run-test.sh
++#	cd tests/asicworld && bash run-test.sh
++#	cd tests/techmap && bash run-test.sh
++#	cd tests/sat && bash run-test.sh
+ 
+ install: $(TARGETS) $(EXTRA_TARGETS)
+ 	$(INSTALL_SUDO) mkdir -p $(DESTDIR)/bin
+@@ -219,6 +219,7 @@
+ -include kernel/*.d
+ -include techlibs/*/*.d
+ 
+-.PHONY: all top-all abc test install install-abc manual clean mrproper qtcreator
++#.PHONY: all top-all abc test install install-abc manual clean mrproper qtcreator
++.PHONY: all top-all abc install install-abc manual clean mrproper qtcreator
+ .PHONY: config-clean config-clang-debug config-gcc-debug config-release
+ 
diff --git a/debian/patches/removeabc.diff b/debian/patches/removeabc.diff
new file mode 100644
index 0000000..4011ba9
--- /dev/null
+++ b/debian/patches/removeabc.diff
@@ -0,0 +1,39 @@
+Index: yosys-0.2.0+/tests/techmap/mem_simple_4x1_runtest.sh
+===================================================================
+--- yosys-0.2.0+.orig/tests/techmap/mem_simple_4x1_runtest.sh	2014-04-12 19:30:08.803862768 +0200
++++ yosys-0.2.0+/tests/techmap/mem_simple_4x1_runtest.sh	2014-04-13 00:29:23.212015340 +0200
+@@ -2,7 +2,7 @@
+ 
+ set -ev
+ 
+-../../yosys -b 'verilog -noattr' -o mem_simple_4x1_synth.v -p 'proc; opt; memory -nomap; techmap -map mem_simple_4x1_map.v;; techmap; opt; abc;; stat' mem_simple_4x1_uut.v
++../../yosys -b 'verilog -noattr' -o mem_simple_4x1_synth.v -p 'proc; opt; memory -nomap; techmap -map mem_simple_4x1_map.v;; techmap; opt;; stat' mem_simple_4x1_uut.v
+ 
+ iverilog -o mem_simple_4x1_gold_tb mem_simple_4x1_tb.v mem_simple_4x1_uut.v
+ iverilog -o mem_simple_4x1_gate_tb mem_simple_4x1_tb.v mem_simple_4x1_synth.v mem_simple_4x1_cells.v
+Index: yosys-0.2.0+/tests/tools/autotest.sh
+===================================================================
+--- yosys-0.2.0+.orig/tests/tools/autotest.sh	2014-04-13 00:02:10.756001468 +0200
++++ yosys-0.2.0+/tests/tools/autotest.sh	2014-04-13 00:29:59.112015646 +0200
+@@ -126,7 +126,7 @@
+ 			test_passes -p "verific -vlog2k $fn; verific -import -gates -all; opt; memory;;"
+ 		else
+ 			test_passes -f "$frontend" -p "hierarchy; proc; opt; memory; opt; fsm; opt" $fn
+-			test_passes -f "$frontend" -p "hierarchy; proc; opt; memory; opt; fsm; opt; techmap; opt; abc -dff; opt" $fn
++			test_passes -f "$frontend" -p "hierarchy; proc; opt; memory; opt; fsm; opt; techmap; opt; " $fn
+ 		fi
+ 		touch ../${bn}.log
+ 	}
+Index: yosys-0.2.0+/Makefile
+===================================================================
+--- yosys-0.2.0+.orig/Makefile	2014-04-13 00:18:29.640009786 +0200
++++ yosys-0.2.0+/Makefile	2014-04-13 00:30:39.800015992 +0200
+@@ -6,7 +6,7 @@
+ # features (the more the better)
+ ENABLE_TCL := 1
+ ENABLE_QT4 := 1
+-ENABLE_ABC := 1
++ENABLE_ABC := 0
+ ENABLE_VERIFIC := 0
+ 
+ # other configuration flags
diff --git a/debian/patches/series b/debian/patches/series
index 082fb6f..560bc60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
 gitrevision.diff
+installpath.diff
+removeabc.diff
+notruntests.diff

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