[yosys] 02/02: Refreshed patches for new upstream version

Ruben Undheim rubund-guest at moszumanska.debian.org
Tue Oct 28 20:39:36 UTC 2014 

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

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

commit e3b13ac8b5e642dfe1b6864d4259ecefd1ce9f1c
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Tue Oct 28 21:35:43 2014 +0100

    Refreshed patches for new upstream version
---
 debian/patches/01_gitrevision.patch    | 12 ++++++------
 debian/patches/02_removeabc.patch      | 22 +++++++++-------------
 debian/patches/03_notruntests.patch    | 14 +++++++-------
 debian/patches/04_installpath.patch    | 12 ++++++------
 debian/patches/05_abc_executable.patch | 10 +++++-----
 debian/patches/06_cflags_ldflags.patch | 24 ++++++++++++------------
 6 files changed, 45 insertions(+), 49 deletions(-)

diff --git a/debian/patches/01_gitrevision.patch b/debian/patches/01_gitrevision.patch
index 66cb8df..e7c1f73 100644
--- a/debian/patches/01_gitrevision.patch
+++ b/debian/patches/01_gitrevision.patch
@@ -5,16 +5,16 @@ Description: Compilation from the upstream code depends on being in
   It must be updated every time upstream changes!
 Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim at gmail.com>
-Index: yosys-0.3.0+20140906git652345c/Makefile
+Index: yosys/Makefile
 ===================================================================
---- yosys-0.3.0+20140906git652345c.orig/Makefile	2014-09-27 09:30:48.000000000 +0000
-+++ yosys-0.3.0+20140906git652345c/Makefile	2014-09-27 09:33:30.187362369 +0000
-@@ -45,7 +45,7 @@
+--- yosys.orig/Makefile	2014-10-28 21:24:31.983412258 +0100
++++ yosys/Makefile	2014-10-28 21:24:28.447412191 +0100
+@@ -48,7 +48,7 @@
  endif
  
- YOSYS_VER := 0.3.0+
+ YOSYS_VER := 0.3.0+$(shell test -d .git && { git log --author=clifford at clifford.at --oneline ca125bf41.. | wc -l; })
 -GIT_REV := $(shell git rev-parse --short HEAD 2> /dev/null || echo UNKNOWN)
-+GIT_REV := 652345c
++GIT_REV := f9c096e 
  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 eaff893..f584877 100644
--- a/debian/patches/02_removeabc.patch
+++ b/debian/patches/02_removeabc.patch
@@ -2,20 +2,16 @@ Description: Don't build abc when building yosys.
   It is built as a separate source package.
 Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim at gmail.com>
-Index: yosys-0.3.0+20140906git652345c/Makefile
+Index: yosys/Makefile
 ===================================================================
---- yosys-0.3.0+20140906git652345c.orig/Makefile	2014-09-27 09:33:30.187362369 +0000
-+++ yosys-0.3.0+20140906git652345c/Makefile	2014-09-27 09:33:53.963346112 +0000
-@@ -110,9 +110,9 @@
- LDFLAGS += -pg
- endif
+--- yosys.orig/Makefile	2014-10-28 21:25:22.411413201 +0100
++++ yosys/Makefile	2014-10-28 21:27:48.631415935 +0100
+@@ -130,7 +130,7 @@
  
--ifeq ($(ENABLE_ABC),1)
--TARGETS += yosys-abc
--endif
-+#ifeq ($(ENABLE_ABC),1)
-+#TARGETS += yosys-abc
-+#endif
+ ifeq ($(ENABLE_ABC),1)
+ CXXFLAGS += -DYOSYS_ENABLE_ABC
+-TARGETS += yosys-abc$(EXE)
++#TARGETS += yosys-abc$(EXE)
+ endif
  
  ifeq ($(ENABLE_VERIFIC),1)
- VERIFIC_DIR ?= /usr/local/src/verific_lib_eval
diff --git a/debian/patches/03_notruntests.patch b/debian/patches/03_notruntests.patch
index 87dcac7..c8fae39 100644
--- a/debian/patches/03_notruntests.patch
+++ b/debian/patches/03_notruntests.patch
@@ -2,13 +2,13 @@ Description: Do not run the long test suite when
   building for debian.
 Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim at gmail.com>
-Index: yosys-0.3.0+20140906git652345c/Makefile
+Index: yosys/Makefile
 ===================================================================
---- yosys-0.3.0+20140906git652345c.orig/Makefile	2014-09-27 09:33:53.963346112 +0000
-+++ yosys-0.3.0+20140906git652345c/Makefile	2014-09-27 09:34:22.035347850 +0000
-@@ -233,20 +233,20 @@
- yosys-abc: abc/abc-$(ABCREV)
- 	$(P) cp abc/abc-$(ABCREV) yosys-abc
+--- yosys.orig/Makefile	2014-10-28 21:28:02.879416202 +0100
++++ yosys/Makefile	2014-10-28 21:28:02.871416202 +0100
+@@ -252,20 +252,20 @@
+ yosys-abc$(EXE): abc/abc-$(ABCREV)$(EXE)
+ 	$(P) cp abc/abc-$(ABCREV)$(EXE) yosys-abc$(EXE)
  
 -test: $(TARGETS) $(EXTRA_TARGETS)
 -	+cd tests/simple && bash run-test.sh
@@ -41,7 +41,7 @@ Index: yosys-0.3.0+20140906git652345c/Makefile
  
  VALGRIND ?= valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes --errors-for-leak-kinds=all
  
-@@ -327,6 +327,6 @@
+@@ -372,6 +372,6 @@
  -include kernel/*.d
  -include techlibs/*/*.d
  
diff --git a/debian/patches/04_installpath.patch b/debian/patches/04_installpath.patch
index 9d0e4ab..52ecd56 100644
--- a/debian/patches/04_installpath.patch
+++ b/debian/patches/04_installpath.patch
@@ -2,11 +2,11 @@ Description: This makes sure that DESTDIR
   is not overwritten in the Makefile.
 Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim at gmail.com>
-Index: yosys-0.3.0+20140906git652345c/Makefile
+Index: yosys/Makefile
 ===================================================================
---- yosys-0.3.0+20140906git652345c.orig/Makefile	2014-09-27 09:34:46.987363882 +0000
-+++ yosys-0.3.0+20140906git652345c/Makefile	2014-09-27 09:35:10.123393601 +0000
-@@ -14,7 +14,7 @@
+--- yosys.orig/Makefile	2014-10-28 21:29:28.995417812 +0100
++++ yosys/Makefile	2014-10-28 21:29:28.987417812 +0100
+@@ -15,7 +15,7 @@
  # other configuration flags
  ENABLE_GPROF := 0
  
@@ -14,8 +14,8 @@ Index: yosys-0.3.0+20140906git652345c/Makefile
 +#DESTDIR := /usr/local
  INSTALL_SUDO :=
  
- OBJS =
-@@ -263,10 +263,10 @@
+ EXE =
+@@ -282,10 +282,10 @@
  	@echo ""
  
  install: $(TARGETS) $(EXTRA_TARGETS)
diff --git a/debian/patches/05_abc_executable.patch b/debian/patches/05_abc_executable.patch
index 3328660..2f2241b 100644
--- a/debian/patches/05_abc_executable.patch
+++ b/debian/patches/05_abc_executable.patch
@@ -4,16 +4,16 @@ Description: The dependency abc is built with the name yosys-abc
   This patch changes the name of the command that yosys looks for.
 Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim at gmail.com>
-Index: yosys-0.3.0+20140906git652345c/passes/abc/abc.cc
+Index: yosys/passes/abc/abc.cc
 ===================================================================
---- yosys-0.3.0+20140906git652345c.orig/passes/abc/abc.cc	2014-09-27 09:30:48.000000000 +0000
-+++ yosys-0.3.0+20140906git652345c/passes/abc/abc.cc	2014-09-27 09:35:58.267358979 +0000
-@@ -1095,7 +1095,7 @@
+--- 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 @@
  		log_header("Executing ABC pass (technology mapping using ABC).\n");
  		log_push();
  
 -		std::string exe_file = proc_self_dirname() + "yosys-abc";
 +		std::string exe_file = proc_self_dirname() + "berkeley-abc";
  		std::string script_file, liberty_file, constr_file, clk_str, delay_target;
- 		bool dff_mode = false, keepff = false, cleanup = true;
+ 		bool fast_mode = false, dff_mode = false, keepff = false, cleanup = true;
  		int lut_mode = 0;
diff --git a/debian/patches/06_cflags_ldflags.patch b/debian/patches/06_cflags_ldflags.patch
index 40f14da..b3829d2 100644
--- a/debian/patches/06_cflags_ldflags.patch
+++ b/debian/patches/06_cflags_ldflags.patch
@@ -2,11 +2,11 @@ Description: Patch to make CPPFLAGS, CXXFLAGS and LDFLAGS
   from dpkg-buildflags be used.
 Forwarded: will do
 Author: Ruben Undheim <ruben.undheim at gmail.com>
-Index: yosys-0.3.0+20140906git652345c/Makefile
+Index: yosys/Makefile
 ===================================================================
---- yosys-0.3.0+20140906git652345c.orig/Makefile	2014-09-27 09:35:26.107358641 +0000
-+++ yosys-0.3.0+20140906git652345c/Makefile	2014-09-27 09:36:19.247452999 +0000
-@@ -27,8 +27,8 @@
+--- yosys.orig/Makefile	2014-10-28 21:32:11.583420853 +0100
++++ yosys/Makefile	2014-10-28 21:34:03.899422954 +0100
+@@ -30,8 +30,8 @@
  
  all: top-all
  
@@ -17,8 +17,8 @@ Index: yosys-0.3.0+20140906git652345c/Makefile
  LDLIBS = -lstdc++ -lm
  QMAKE = qmake-qt4
  SED = sed
-@@ -195,10 +195,10 @@
- 	$(P) $(CXX) -o yosys $(LDFLAGS) $(OBJS) $(LDLIBS)
+@@ -214,10 +214,10 @@
+ 	$(P) $(CXX) -o yosys$(EXE) $(LDFLAGS) $(OBJS) $(LDLIBS)
  
  %.o: %.cc
 -	$(P) $(CXX) -o $@ -c $(CXXFLAGS) $<
@@ -30,14 +30,14 @@ Index: yosys-0.3.0+20140906git652345c/Makefile
  
  kernel/version_$(GIT_REV).cc: Makefile
  	$(P) rm -f kernel/version_*.o kernel/version_*.d kernel/version_*.cc
-@@ -206,8 +206,8 @@
- 			$(CXX) --version | tr ' ()' '\n' | grep '^[0-9]' | head -n1` $(filter -f% -m% -O% -DNDEBUG,$(CXXFLAGS)))\";" > kernel/version_$(GIT_REV).cc
+@@ -225,8 +225,8 @@
+ 			$(CXX) --version | tr ' ()' '\n' | grep '^[0-9]' | head -n1` $(filter -f% -m% -O% -DNDEBUG,$(CXXFLAGS)))\"; }" > kernel/version_$(GIT_REV).cc
  
- yosys-config: yosys-config.in
+ yosys-config: misc/yosys-config.in
 -	$(P) $(SED) -e 's, at CXX@,$(CXX),;' -e 's, at CXXFLAGS@,$(CXXFLAGS),;' -e 's, at LDFLAGS@,$(LDFLAGS),;' -e 's, at LDLIBS@,$(LDLIBS),;' \
--			-e 's, at BINDIR@,$(DESTDIR)/bin,;' -e 's, at DATDIR@,$(DESTDIR)/share/yosys,;' < yosys-config.in > yosys-config
+-			-e 's, at BINDIR@,$(DESTDIR)/bin,;' -e 's, at DATDIR@,$(DESTDIR)/share/yosys,;' < misc/yosys-config.in > yosys-config
 +	$(P) $(SED) -e 's#@CXX@#$(CXX)#;' -e 's#@CXXFLAGS@#$(CXXFLAGS)#;' -e 's#@LDFLAGS@#$(LDFLAGS)#;' -e 's#@LDLIBS@#$(LDLIBS)#;' \
-+			-e 's#@BINDIR@#$(DESTDIR)/bin#;' -e 's#@DATDIR@#$(DESTDIR)/share/yosys#;' < yosys-config.in > yosys-config
++			-e 's#@BINDIR@#$(DESTDIR)/bin#;' -e 's#@DATDIR@#$(DESTDIR)/share/yosys#;' < misc/yosys-config.in > yosys-config
  	$(Q) chmod +x yosys-config
  
- abc/abc-$(ABCREV):
+ abc/abc-$(ABCREV)$(EXE):

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

More information about the debian-science-commits mailing list