[yosys] 03/05: Refreshed patches

Ruben Undheim rubund-guest at moszumanska.debian.org
Mon Feb 9 19:55:47 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 af60ba68b8495e5ff0ceeece5ae772b5aaa6bea1
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Mon Feb 9 20:46:25 2015 +0100

    Refreshed patches
---
 debian/patches/01_gitrevision.patch    | 10 +++++-----
 debian/patches/02_removeabc.patch      |  6 +++---
 debian/patches/03_notruntests.patch    |  8 ++++----
 debian/patches/04_installpath.patch    | 12 ++++++------
 debian/patches/05_abc_executable.patch |  4 ++--
 debian/patches/06_cflags_ldflags.patch | 26 ++++++++++++++------------
 6 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/debian/patches/01_gitrevision.patch b/debian/patches/01_gitrevision.patch
index e627469..755fe29 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	2015-02-01 21:32:52.685592457 +0100
-+++ yosys/Makefile	2015-02-01 21:33:34.021592900 +0100
-@@ -54,7 +54,7 @@
+--- yosys.orig/Makefile	2015-02-09 20:38:17.263383691 +0100
++++ yosys/Makefile	2015-02-09 20:39:35.339384528 +0100
+@@ -58,7 +58,7 @@
  endif
  
- YOSYS_VER := 0.4+$(shell test -d .git && { git log --author=clifford at clifford.at --oneline d5aa0ee158b41.. | wc -l; })
+ YOSYS_VER := 0.5
 -GIT_REV := $(shell git rev-parse --short HEAD 2> /dev/null || echo UNKNOWN)
-+GIT_REV := 3cbfa38
++GIT_REV := c3c9fbf
  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 c9cf105..164d615 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	2015-02-01 21:35:29.921594143 +0100
-+++ yosys/Makefile	2015-02-01 21:35:29.921594143 +0100
-@@ -140,7 +140,7 @@
+--- yosys.orig/Makefile	2015-02-09 20:40:04.407384840 +0100
++++ yosys/Makefile	2015-02-09 20:40:04.407384840 +0100
+@@ -144,7 +144,7 @@
  
  ifeq ($(ENABLE_ABC),1)
  CXXFLAGS += -DYOSYS_ENABLE_ABC
diff --git a/debian/patches/03_notruntests.patch b/debian/patches/03_notruntests.patch
index ea251db..95b1392 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	2015-02-01 21:35:43.277594286 +0100
-+++ yosys/Makefile	2015-02-01 21:36:00.345594469 +0100
-@@ -273,21 +273,21 @@
+--- yosys.orig/Makefile	2015-02-09 20:40:27.063385083 +0100
++++ yosys/Makefile	2015-02-09 20:40:27.059385083 +0100
+@@ -301,21 +301,21 @@
  yosys-abc$(EXE): abc/abc-$(ABCREV)$(EXE)
  	$(P) cp abc/abc-$(ABCREV)$(EXE) yosys-abc$(EXE)
  
@@ -43,7 +43,7 @@ Index: yosys/Makefile
  
  VALGRIND ?= valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes --errors-for-leak-kinds=all
  
-@@ -417,6 +417,6 @@
+@@ -435,6 +435,6 @@
  -include kernel/*.d
  -include techlibs/*/*.d
  
diff --git a/debian/patches/04_installpath.patch b/debian/patches/04_installpath.patch
index b8fea33..0cb8cd8 100644
--- a/debian/patches/04_installpath.patch
+++ b/debian/patches/04_installpath.patch
@@ -4,8 +4,8 @@ Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 Index: yosys/Makefile
 ===================================================================
---- yosys.orig/Makefile	2015-02-01 21:36:03.889594507 +0100
-+++ yosys/Makefile	2015-02-01 21:36:03.889594507 +0100
+--- yosys.orig/Makefile	2015-02-09 20:40:46.015385286 +0100
++++ yosys/Makefile	2015-02-09 20:40:46.015385286 +0100
 @@ -17,7 +17,7 @@
  ENABLE_GPROF := 0
  ENABLE_NDEBUG := 0
@@ -14,8 +14,8 @@ Index: yosys/Makefile
 +#DESTDIR := /usr/local
  INSTALL_SUDO :=
  
- EXE =
-@@ -304,10 +304,10 @@
+ TARGET_BINDIR := $(DESTDIR)/bin
+@@ -332,10 +332,10 @@
  	@echo ""
  
  install: $(TARGETS) $(EXTRA_TARGETS)
@@ -28,5 +28,5 @@ Index: yosys/Makefile
 +	$(INSTALL_SUDO) mkdir -p $(DESTDIR)/usr/share/yosys
 +	$(INSTALL_SUDO) cp -r share/. $(DESTDIR)/usr/share/yosys/.
  
- manual: $(TARGETS) $(EXTRA_TARGETS)
- 	cd manual && bash appnotes.sh
+ uninstall:
+ 	$(INSTALL_SUDO) rm -vf $(addprefix $(DESTDIR)/bin/,$(notdir $(TARGETS)))
diff --git a/debian/patches/05_abc_executable.patch b/debian/patches/05_abc_executable.patch
index 389a3b8..b21912d 100644
--- a/debian/patches/05_abc_executable.patch
+++ b/debian/patches/05_abc_executable.patch
@@ -6,8 +6,8 @@ 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	2015-02-01 21:36:41.681594913 +0100
-+++ yosys/passes/abc/abc.cc	2015-02-01 21:36:41.677594913 +0100
+--- yosys.orig/passes/abc/abc.cc	2015-02-09 20:41:36.823385831 +0100
++++ yosys/passes/abc/abc.cc	2015-02-09 20:41:36.823385831 +0100
 @@ -1190,7 +1190,7 @@
  		log_header("Executing ABC pass (technology mapping using ABC).\n");
  		log_push();
diff --git a/debian/patches/06_cflags_ldflags.patch b/debian/patches/06_cflags_ldflags.patch
index 8a0bde6..5ee16a0 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	2015-02-01 21:37:10.281595220 +0100
-+++ yosys/Makefile	2015-02-01 21:38:05.705595814 +0100
-@@ -32,8 +32,8 @@
- 
+--- yosys.orig/Makefile	2015-02-09 20:41:58.399386062 +0100
++++ yosys/Makefile	2015-02-09 20:44:50.183387905 +0100
+@@ -36,8 +36,8 @@
  all: top-all
  
--CXXFLAGS = -Wall -Wextra -ggdb -I"$(shell pwd)" -MD -DYOSYS_SRC='"$(shell pwd)"' -D_YOSYS_ -fPIC -I$(DESTDIR)/include
+ YOSYS_SRC := $(shell pwd)
+-CXXFLAGS = -Wall -Wextra -ggdb -I"$(YOSYS_SRC)" -MD -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
++CXXFLAGS += -Wall -Wextra -ggdb -I"$(YOSYS_SRC)" -MD -D_YOSYS_ -fPIC -I$(DESTDIR)/include
 +LDFLAGS += -L$(DESTDIR)/lib
  LDLIBS = -lstdc++ -lm
  SED = sed
  BISON = bison
-@@ -235,10 +235,10 @@
+@@ -262,10 +262,10 @@
  	$(P) $(CXX) -o yosys$(EXE) $(LDFLAGS) $(OBJS) $(LDLIBS)
  
  %.o: %.cc
@@ -30,14 +30,16 @@ Index: yosys/Makefile
  
  kernel/version_$(GIT_REV).cc: Makefile
  	$(P) rm -f kernel/version_*.o kernel/version_*.d kernel/version_*.cc
-@@ -246,8 +246,8 @@
+@@ -273,9 +273,9 @@
  			$(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
--	$(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,;' < 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#;' < misc/yosys-config.in > yosys-config
+-	$(P) $(SED) -e 's, at CXXFLAGS@,$(subst -I"$(YOSYS_SRC)",-I"$(TARGET_DATDIR)/include",$(CXXFLAGS)),;' \
+-			-e 's, at CXX@,$(CXX),;' -e 's, at LDFLAGS@,$(LDFLAGS),;' -e 's, at LDLIBS@,$(LDLIBS),;' \
+-			-e 's, at BINDIR@,$(TARGET_BINDIR),;' -e 's, at DATDIR@,$(TARGET_DATDIR),;' < misc/yosys-config.in > yosys-config
++	$(P) $(SED) -e 's#@CXXFLAGS@#$(subst -I"$(YOSYS_SRC)",-I"$(TARGET_DATDIR)/include",$(CXXFLAGS))#;' \
++			-e 's#@CXX@#$(CXX)#;' -e 's#@LDFLAGS@#$(LDFLAGS)#;' -e 's#@LDLIBS@#$(LDLIBS)#;' \
++			-e 's#@BINDIR@#$(TARGET_BINDIR)#;' -e 's#@DATDIR@#$(TARGET_DATDIR)#;' < misc/yosys-config.in > yosys-config
  	$(Q) chmod +x yosys-config
  
  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