[yosys] 04/04: Refreshed patches

Sun Feb 1 20:38:57 UTC 2015

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

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

commit 04e108c7d18be783399e39ecc8f5d764c67da5fa
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Feb 1 21:38:46 2015 +0100

    Refreshed patches
---
 debian/patches/01_gitrevision.patch    | 10 +++++-----
 debian/patches/02_removeabc.patch      |  6 +++---
 debian/patches/03_notruntests.patch    | 10 ++++++----
 debian/patches/04_installpath.patch    | 10 +++++-----
 debian/patches/05_abc_executable.patch |  8 ++++----
 debian/patches/06_cflags_ldflags.patch | 20 ++++++++++----------
 6 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/debian/patches/01_gitrevision.patch b/debian/patches/01_gitrevision.patch
index c4c4b10..e627469 100644
--- a/debian/patches/01_gitrevision.patch
+++ b/debian/patches/01_gitrevision.patch
@@ -7,14 +7,14 @@ Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 Index: yosys/Makefile
 ===================================================================
---- yosys.orig/Makefile	2014-11-08 22:44:31.830902630 +0100
-+++ yosys/Makefile	2014-11-08 22:45:30.574902254 +0100
-@@ -47,7 +47,7 @@
+--- yosys.orig/Makefile	2015-02-01 21:32:52.685592457 +0100
++++ yosys/Makefile	2015-02-01 21:33:34.021592900 +0100
+@@ -54,7 +54,7 @@
  endif
  
- YOSYS_VER := 0.4
+ YOSYS_VER := 0.4+$(shell test -d .git && { git log --author=clifford at clifford.at --oneline d5aa0ee158b41.. | wc -l; })
 -GIT_REV := $(shell git rev-parse --short HEAD 2> /dev/null || echo UNKNOWN)
-+GIT_REV := d5aa0ee
++GIT_REV := 3cbfa38
  OBJS = kernel/version_$(GIT_REV).o
  
  # set 'ABCREV = default' to use abc/ as it is
diff --git a/debian/patches/02_removeabc.patch b/debian/patches/02_removeabc.patch
index 9039a28..c9cf105 100644
--- a/debian/patches/02_removeabc.patch
+++ b/debian/patches/02_removeabc.patch
@@ -4,9 +4,9 @@ Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 Index: yosys/Makefile
 ===================================================================
---- yosys.orig/Makefile	2014-11-08 22:45:42.554902177 +0100
-+++ yosys/Makefile	2014-11-08 22:45:42.550902177 +0100
-@@ -129,7 +129,7 @@
+--- yosys.orig/Makefile	2015-02-01 21:35:29.921594143 +0100
++++ yosys/Makefile	2015-02-01 21:35:29.921594143 +0100
+@@ -140,7 +140,7 @@
  
  ifeq ($(ENABLE_ABC),1)
  CXXFLAGS += -DYOSYS_ENABLE_ABC
diff --git a/debian/patches/03_notruntests.patch b/debian/patches/03_notruntests.patch
index c3f4aa9..ea251db 100644
--- a/debian/patches/03_notruntests.patch
+++ b/debian/patches/03_notruntests.patch
@@ -4,9 +4,9 @@ Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 Index: yosys/Makefile
 ===================================================================
---- yosys.orig/Makefile	2014-11-08 22:56:12.518898145 +0100
-+++ yosys/Makefile	2014-11-08 22:56:18.774898105 +0100
-@@ -255,20 +255,20 @@
+--- yosys.orig/Makefile	2015-02-01 21:35:43.277594286 +0100
++++ yosys/Makefile	2015-02-01 21:36:00.345594469 +0100
+@@ -273,21 +273,21 @@
  yosys-abc$(EXE): abc/abc-$(ABCREV)$(EXE)
  	$(P) cp abc/abc-$(ABCREV)$(EXE) yosys-abc$(EXE)
  
@@ -19,6 +19,7 @@ Index: yosys/Makefile
 -	+cd tests/fsm && bash run-test.sh
 -	+cd tests/techmap && bash run-test.sh
 -	+cd tests/memories && bash run-test.sh
+-	+cd tests/bram && bash run-test.sh
 -	+cd tests/various && bash run-test.sh
 -	+cd tests/sat && bash run-test.sh
 -	@echo ""
@@ -33,6 +34,7 @@ Index: yosys/Makefile
 +#	+cd tests/fsm && bash run-test.sh
 +#	+cd tests/techmap && bash run-test.sh
 +#	+cd tests/memories && bash run-test.sh
++#	+cd tests/bram && bash run-test.sh
 +#	+cd tests/various && bash run-test.sh
 +#	+cd tests/sat && bash run-test.sh
 +#	@echo ""
@@ -41,7 +43,7 @@ Index: yosys/Makefile
  
  VALGRIND ?= valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes --errors-for-leak-kinds=all
  
-@@ -375,6 +375,6 @@
+@@ -417,6 +417,6 @@
  -include kernel/*.d
  -include techlibs/*/*.d
  
diff --git a/debian/patches/04_installpath.patch b/debian/patches/04_installpath.patch
index 46e0cdc..b8fea33 100644
--- a/debian/patches/04_installpath.patch
+++ b/debian/patches/04_installpath.patch
@@ -4,18 +4,18 @@ Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 Index: yosys/Makefile
 ===================================================================
---- yosys.orig/Makefile	2014-11-08 22:46:32.514901858 +0100
-+++ yosys/Makefile	2014-11-08 22:46:32.510901858 +0100
-@@ -16,7 +16,7 @@
- # other configuration flags
+--- yosys.orig/Makefile	2015-02-01 21:36:03.889594507 +0100
++++ yosys/Makefile	2015-02-01 21:36:03.889594507 +0100
+@@ -17,7 +17,7 @@
  ENABLE_GPROF := 0
+ ENABLE_NDEBUG := 0
  
 -DESTDIR := /usr/local
 +#DESTDIR := /usr/local
  INSTALL_SUDO :=
  
  EXE =
-@@ -285,10 +285,10 @@
+@@ -304,10 +304,10 @@
  	@echo ""
  
  install: $(TARGETS) $(EXTRA_TARGETS)
diff --git a/debian/patches/05_abc_executable.patch b/debian/patches/05_abc_executable.patch
index 2f2241b..389a3b8 100644
--- a/debian/patches/05_abc_executable.patch
+++ b/debian/patches/05_abc_executable.patch
@@ -6,9 +6,9 @@ Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 Index: yosys/passes/abc/abc.cc
 ===================================================================
---- yosys.orig/passes/abc/abc.cc	2014-10-28 21:30:10.095418581 +0100
-+++ yosys/passes/abc/abc.cc	2014-10-28 21:30:10.091418581 +0100
-@@ -1101,7 +1101,7 @@
+--- yosys.orig/passes/abc/abc.cc	2015-02-01 21:36:41.681594913 +0100
++++ yosys/passes/abc/abc.cc	2015-02-01 21:36:41.677594913 +0100
+@@ -1190,7 +1190,7 @@
  		log_header("Executing ABC pass (technology mapping using ABC).\n");
  		log_push();
  
@@ -16,4 +16,4 @@ Index: yosys/passes/abc/abc.cc
 +		std::string exe_file = proc_self_dirname() + "berkeley-abc";
  		std::string script_file, liberty_file, constr_file, clk_str, delay_target;
  		bool fast_mode = false, dff_mode = false, keepff = false, cleanup = true;
- 		int lut_mode = 0;
+ 		bool show_tempdir = false;
diff --git a/debian/patches/06_cflags_ldflags.patch b/debian/patches/06_cflags_ldflags.patch
index 774e38b..8a0bde6 100644
--- a/debian/patches/06_cflags_ldflags.patch
+++ b/debian/patches/06_cflags_ldflags.patch
@@ -4,20 +4,20 @@ Forwarded: will do
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 Index: yosys/Makefile
 ===================================================================
---- yosys.orig/Makefile	2014-11-08 22:47:08.578901627 +0100
-+++ yosys/Makefile	2014-11-08 22:47:08.574901627 +0100
-@@ -31,8 +31,8 @@
+--- yosys.orig/Makefile	2015-02-01 21:37:10.281595220 +0100
++++ yosys/Makefile	2015-02-01 21:38:05.705595814 +0100
+@@ -32,8 +32,8 @@
  
  all: top-all
  
--CXXFLAGS = -Wall -Wextra -ggdb -I"$(shell pwd)" -MD -DYOSYS_SRC='"$(shell pwd)"' -D_YOSYS_ -fPIC -I${DESTDIR}/include
--LDFLAGS = -L${DESTDIR}/lib
-+CXXFLAGS += -Wall -Wextra -ggdb -I"$(shell pwd)" -MD -DYOSYS_SRC='"$(shell pwd)"' -D_YOSYS_ -fPIC -I${DESTDIR}/include
-+LDFLAGS += -L${DESTDIR}/lib
+-CXXFLAGS = -Wall -Wextra -ggdb -I"$(shell pwd)" -MD -DYOSYS_SRC='"$(shell pwd)"' -D_YOSYS_ -fPIC -I$(DESTDIR)/include
+-LDFLAGS = -L$(DESTDIR)/lib
++CXXFLAGS += -Wall -Wextra -ggdb -I"$(shell pwd)" -MD -DYOSYS_SRC='"$(shell pwd)"' -D_YOSYS_ -fPIC -I$(DESTDIR)/include
++LDFLAGS += -L$(DESTDIR)/lib
  LDLIBS = -lstdc++ -lm
  SED = sed
- 
-@@ -217,10 +217,10 @@
+ BISON = bison
+@@ -235,10 +235,10 @@
  	$(P) $(CXX) -o yosys$(EXE) $(LDFLAGS) $(OBJS) $(LDLIBS)
  
  %.o: %.cc
@@ -30,7 +30,7 @@ Index: yosys/Makefile
  
  kernel/version_$(GIT_REV).cc: Makefile
  	$(P) rm -f kernel/version_*.o kernel/version_*.d kernel/version_*.cc
-@@ -228,8 +228,8 @@
+@@ -246,8 +246,8 @@
  			$(CXX) --version | tr ' ()' '\n' | grep '^[0-9]' | head -n1` $(filter -f% -m% -O% -DNDEBUG,$(CXXFLAGS)))\"; }" > kernel/version_$(GIT_REV).cc
  
  yosys-config: misc/yosys-config.in

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

