Skip to content

Commits on Source 2

Show whitespace changes
Inline Side-by-side
debian/changelog
View file @ 076de3b2
mash (2.1-2) unstable; urgency=medium
* Adjust CXXFLAGS due to new dependency requirements.
-- Sascha Steinbiss <satta@debian.org> Wed, 26 Dec 2018 14:17:06 +0000
mash (2.1-1) unstable; urgency=medium
[ Jelmer Vernooij ]
......
debian/patches/capnp0_7.patch 0 → 100644
View file @ 076de3b2
Description: raise C++ standard to allow building with capnp 0.7
Author: Sascha Steinbiss <satta@debian.org>
Bug: https://github.com/marbl/Mash/issues/98
Last-Update: 2018-12-26
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@
AC_MSG_ERROR([Cap'n Proto compiler (capnp) not found.])
fi
-CPPFLAGS="-I$with_capnp/include -std=c++11"
+CPPFLAGS="-I$with_capnp/include -std=c++14"
AC_CHECK_HEADER(capnp/common.h, [result=1], [result=0])
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-CXXFLAGS += -O3 -std=c++11 -Isrc -I@capnp@/include -I@mathinc@
+CXXFLAGS += -O3 -std=c++14 -Isrc -I@capnp@/include -I@mathinc@
CPPFLAGS += @amcppflags@
UNAME_S=$(shell uname -s)
debian/patches/drop_memcpy_wrapper.patch
View file @ 076de3b2
......@@ -13,7 +13,7 @@ Author: Sascha Steinbiss <satta@debian.org>
endif
SOURCES=\
@@ -35,8 +32,8 @@
@@ -36,8 +33,8 @@
all : mash libmash.a
......@@ -24,7 +24,7 @@ Author: Sascha Steinbiss <satta@debian.org>
libmash.a : $(OBJECTS)
ar -cr libmash.a $(OBJECTS)
@@ -50,9 +47,6 @@
@@ -51,9 +48,6 @@
%.o : %.c++
$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
......
debian/patches/hardening.patch
View file @ 076de3b2
......@@ -3,7 +3,7 @@ Description: add hardening support
Author: Sascha Steinbiss <satta@debian.org>
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,7 +36,7 @@
@@ -37,7 +37,7 @@
all : mash libmash.a
mash : libmash.a src/mash/memcpyWrap.o
......
debian/patches/link_dynamically_against_capnp.patch
View file @ 076de3b2
......@@ -2,7 +2,7 @@ Description: link dynamically against libcapnp and friends
Author: Sascha Steinbiss <satta@debian.org>
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,8 +32,8 @@
@@ -33,8 +33,8 @@
all : mash libmash.a
......
debian/patches/parallel.patch
View file @ 076de3b2
......@@ -7,7 +7,7 @@ Author: Adrian Bunk <bunk@debian.org>
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,7 +47,9 @@
@@ -48,7 +48,9 @@
%.o : %.c++
$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
......
debian/patches/series
View file @ 076de3b2
......@@ -3,3 +3,4 @@ use_debian_mathjax.patch
drop_memcpy_wrapper.patch
link_dynamically_against_capnp.patch
parallel.patch
capnp0_7.patch