diff options
author | Ruben Undheim <ruben.undheim@gmail.com> | 2018-10-17 18:02:03 +0200 |
---|---|---|
committer | Ruben Undheim <ruben.undheim@gmail.com> | 2018-10-17 18:02:03 +0200 |
commit | 42daa78b5be0b7b54d2c6a870cbaa6112b7fe388 (patch) | |
tree | 85ff85e1a72be10904ccf1dbbca48ad124ca934f | |
parent | 127ca27dd106b25d1d84ec33300b70c8e93c36de (diff) |
Refreshed patches for 0.8 etc
8 files changed, 15 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog index e2ca6b29..2a4f7a06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -yosys (0.7+20181007git9850de4-1) UNRELEASED; urgency=medium +yosys (0.8-1) UNRELEASED; urgency=medium - * New upstream version 0.7+20181007git9850de4 + * New upstream release * Fix patches after importing new version -- Ruben Undheim <ruben.undheim@gmail.com> Thu, 30 Aug 2018 19:01:57 +0000 diff --git a/debian/patches/0007-Disable-pretty-build.patch b/debian/patches/0007-Disable-pretty-build.patch index 7a999a2c..c115f66b 100644 --- a/debian/patches/0007-Disable-pretty-build.patch +++ b/debian/patches/0007-Disable-pretty-build.patch @@ -7,7 +7,7 @@ Subject: Disable pretty build 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index c888b2c..ebefd2a 100644 +index f357258..13b19ce 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ EXTRA_OBJS = diff --git a/debian/patches/0009-Some-spelling-errors-fixed.patch b/debian/patches/0009-Some-spelling-errors-fixed.patch index 0be0dc04..40cc827a 100644 --- a/debian/patches/0009-Some-spelling-errors-fixed.patch +++ b/debian/patches/0009-Some-spelling-errors-fixed.patch @@ -92,10 +92,10 @@ index 964875d..ae5cf09 100644 This makes some aspects of RTLIL more complex but enables Yosys to be used for coarse grain synthesis where the cells of the target architecture operate on diff --git a/manual/command-reference-manual.tex b/manual/command-reference-manual.tex -index fea2354..c530186 100644 +index bed6326..eb43467 100644 --- a/manual/command-reference-manual.tex +++ b/manual/command-reference-manual.tex -@@ -2859,7 +2859,7 @@ to a graphics file (usually SVG or PostScript). +@@ -3182,7 +3182,7 @@ to a graphics file (usually SVG or PostScript). assigned to each unique value of this attribute. -width diff --git a/debian/patches/0010-Fix-reproducibility-of-PDF-documents-in-yosys-doc.patch b/debian/patches/0010-Fix-reproducibility-of-PDF-documents-in-yosys-doc.patch index f5e4236c..aa77fe92 100644 --- a/debian/patches/0010-Fix-reproducibility-of-PDF-documents-in-yosys-doc.patch +++ b/debian/patches/0010-Fix-reproducibility-of-PDF-documents-in-yosys-doc.patch @@ -11,7 +11,7 @@ Subject: Fix reproducibility of PDF documents in yosys-doc 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile -index ebefd2a..1fdb05f 100644 +index 13b19ce..e7a9de1 100644 --- a/Makefile +++ b/Makefile @@ -638,9 +638,9 @@ update-manual: $(TARGETS) $(EXTRA_TARGETS) diff --git a/debian/patches/0011-Do-not-show-g-build-flags-in-Version-string.patch b/debian/patches/0011-Do-not-show-g-build-flags-in-Version-string.patch index ff3fff03..b72651db 100644 --- a/debian/patches/0011-Do-not-show-g-build-flags-in-Version-string.patch +++ b/debian/patches/0011-Do-not-show-g-build-flags-in-Version-string.patch @@ -7,7 +7,7 @@ Subject: Do not show g++ build flags in Version string 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile -index 1fdb05f..0fe949b 100644 +index e7a9de1..5c381ff 100644 --- a/Makefile +++ b/Makefile @@ -504,8 +504,7 @@ libyosys.so: $(filter-out kernel/driver.o,$(OBJS)) diff --git a/debian/patches/0013-Let-dpkg-buildpackage-handle-stripping-of-binaries.patch b/debian/patches/0013-Let-dpkg-buildpackage-handle-stripping-of-binaries.patch index e53c6a28..9ae6f28a 100644 --- a/debian/patches/0013-Let-dpkg-buildpackage-handle-stripping-of-binaries.patch +++ b/debian/patches/0013-Let-dpkg-buildpackage-handle-stripping-of-binaries.patch @@ -7,7 +7,7 @@ Subject: Let dpkg-buildpackage handle stripping of binaries 1 file changed, 4 deletions(-) diff --git a/Makefile b/Makefile -index 0fe949b..a3f641b 100644 +index 5c381ff..02e5771 100644 --- a/Makefile +++ b/Makefile @@ -612,19 +612,15 @@ install: $(TARGETS) $(EXTRA_TARGETS) diff --git a/debian/patches/01_gitrevision.patch b/debian/patches/01_gitrevision.patch index 4a519944..8e3b5352 100644 --- a/debian/patches/01_gitrevision.patch +++ b/debian/patches/01_gitrevision.patch @@ -7,21 +7,19 @@ Subject: Compilation from the upstream code depends on being in the git Forwarded: doesn't make sense upstream --- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 365b92e..3839e34 100644 +index d759b11..c92c808 100644 --- a/Makefile +++ b/Makefile -@@ -99,8 +99,8 @@ LDFLAGS += -rdynamic - LDLIBS += -lrt +@@ -100,7 +100,7 @@ LDLIBS += -lrt endif --YOSYS_VER := 0.7+$(shell cd $(YOSYS_SRC) && test -e .git && { git log --author=clifford@clifford.at --oneline 61f6811.. | wc -l; }) + YOSYS_VER := 0.8 -GIT_REV := $(shell cd $(YOSYS_SRC) && git rev-parse --short HEAD 2> /dev/null || echo UNKNOWN) -+YOSYS_VER := 0.7 -+GIT_REV := 0b7a184 ++GIT_REV := 5706e90 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 a56f15ee..4ef26c8c 100644 --- a/debian/patches/02_removeabc.patch +++ b/debian/patches/02_removeabc.patch @@ -9,7 +9,7 @@ Forwarded: doesn't make sense upstream 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 3839e34..c888b2c 100644 +index c92c808..f357258 100644 --- a/Makefile +++ b/Makefile @@ -350,7 +350,7 @@ LDLIBS += -lpthread |