summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Undheim <ruben.undheim@gmail.com>2018-08-19 23:07:15 +0200
committerRuben Undheim <ruben.undheim@gmail.com>2018-08-19 23:07:15 +0200
commit524461fd06356d0369c28ae6489b407092962f39 (patch)
treea54ab9ac43cb3a27b2bbcfa9ac3209ebeca116c3
parent849f9e5b161be53761c0c11f4013c7626ed91450 (diff)
Add patch for embedded build flags. Bump debhelper and std version
-rw-r--r--debian/changelog13
-rw-r--r--debian/compat2
-rw-r--r--debian/control4
-rw-r--r--debian/patches/0011-Do-not-show-g-build-flags-in-Version-string.patch22
-rw-r--r--debian/patches/series1
5 files changed, 39 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 334d7903..500c4a4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+yosys (0.7-6) UNRELEASED; urgency=medium
+
+ * debian/compat: level 11
+ * debian/control:
+ - debhelper >= 11
+ - Standards version 4.2.0 - no changes
+ * debian/upstream/metadata: Added upstream metadata
+ * d/patches/0011-Do-not-show-g-build-flags-in-Version-string.patch:
+ - some build flags for the g++ version being used were "injected" into
+ the source files for yosys. Remove them
+
+ -- Ruben Undheim <ruben.undheim@gmail.com> Sun, 19 Aug 2018 23:04:50 +0200
+
yosys (0.7-5) unstable; urgency=medium
* debian/patches/0010-Fix-adding-of-sys.path-in-yosys-smtbmc.patch
diff --git a/debian/compat b/debian/compat
index ec635144..b4de3947 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11
diff --git a/debian/control b/debian/control
index e18ca98a..a9e8b276 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Uploaders: Ruben Undheim <ruben.undheim@gmail.com>,
Sebastian Kuzminsky <seb@highlab.com>
Section: electronics
Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 11),
dh-python,
tcl-dev,
libreadline-dev,
@@ -30,7 +30,7 @@ Build-Depends-Indep:
texlive-bibtex-extra,
lmodern,
graphviz
-Standards-Version: 4.1.5
+Standards-Version: 4.2.0
Vcs-Browser: https://salsa.debian.org/science-team/yosys
Vcs-Git: https://salsa.debian.org/science-team/yosys.git
Homepage: http://www.clifford.at/yosys
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
new file mode 100644
index 00000000..10ceec2c
--- /dev/null
+++ b/debian/patches/0011-Do-not-show-g-build-flags-in-Version-string.patch
@@ -0,0 +1,22 @@
+From: Ruben Undheim <ruben.undheim@gmail.com>
+Date: Sun, 19 Aug 2018 23:03:51 +0200
+Subject: Do not show g++ build flags in Version string
+
+---
+ Makefile | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index aa66a54..8613943 100644
+--- a/Makefile
++++ b/Makefile
+@@ -370,8 +370,7 @@ libyosys.so: $(filter-out kernel/driver.o,$(OBJS))
+ $(Q) mkdir -p $(dir $@)
+ $(P) $(CXX) -o $@ -c $(CPPFLAGS) $(CXXFLAGS) $<
+
+-YOSYS_VER_STR := Yosys $(YOSYS_VER) (git sha1 $(GIT_REV), $(notdir $(CXX)) $(shell \
+- $(CXX) --version | tr ' ()' '\n' | grep '^[0-9]' | head -n1) $(filter -f% -m% -O% -DNDEBUG,$(CXXFLAGS)))
++YOSYS_VER_STR := Yosys $(YOSYS_VER) (git sha1 $(GIT_REV))
+
+ kernel/version_$(GIT_REV).cc: $(YOSYS_SRC)/Makefile
+ $(P) rm -f kernel/version_*.o kernel/version_*.d kernel/version_*.cc
diff --git a/debian/patches/series b/debian/patches/series
index 57796885..d2a2706f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ kfreebsd-support.patch
0009-Some-spelling-errors-fixed.patch
0010-Fix-reproducibility-of-PDF-documents-in-yosys-doc.patch
0010-Fix-adding-of-sys.path-in-yosys-smtbmc.patch
+0011-Do-not-show-g-build-flags-in-Version-string.patch