[med-svn] [mash] 01/01: drop memcpy wrapper

[Sascha Steinbiss]

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

satta pushed a commit to branch master
in repository mash.

commit be39868783fcd20e8a7212a554c0c884aad5a08a
Author: Sascha Steinbiss <satta at debian.org>
Date:   Thu Jul 21 12:14:24 2016 +0000

    drop memcpy wrapper
---
 debian/changelog                         |  6 ++++++
 debian/patches/drop_memcpy_wrapper.patch | 36 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 43 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 41b5baa..bf7028e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mash (1.1-2) unstable; urgency=medium
+
+  * Drop memcpy wrapper to allow building on more platforms.
+
+ -- Sascha Steinbiss <satta at debian.org>  Thu, 21 Jul 2016 12:13:59 +0000
+
 mash (1.1-1) unstable; urgency=medium
 
   * Initial release (Closes: #831781)
diff --git a/debian/patches/drop_memcpy_wrapper.patch b/debian/patches/drop_memcpy_wrapper.patch
new file mode 100644
index 0000000..14e72db
--- /dev/null
+++ b/debian/patches/drop_memcpy_wrapper.patch
@@ -0,0 +1,36 @@
+Description: drop memcpy wrapper
+ Not needed here, as our binaries needn't be portable across glib versions.
+Author: Sascha Steinbiss <satta at debian.org>
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -5,9 +5,6 @@
+ 
+ ifeq ($(UNAME_S),Darwin)
+ 	CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++
+-else
+-	CXXFLAGS += -include src/mash/memcpyLink.h -Wl,--wrap=memcpy
+-	CFLAGS += -include src/mash/memcpyLink.h
+ endif
+ 
+ SOURCES=\
+@@ -34,8 +31,8 @@
+ 
+ all : mash libmash.a
+ 
+-mash : libmash.a src/mash/memcpyWrap.o
+-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o mash src/mash/memcpyWrap.o libmash.a @capnp@/lib/libcapnp.a @capnp@/lib/libkj.a @mathlib@ -lstdc++ -lz -lm -lpthread $(LDFLAGS)
++mash : libmash.a
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o mash libmash.a @capnp@/lib/libcapnp.a @capnp@/lib/libkj.a @mathlib@ -lstdc++ -lz -lm -lpthread $(LDFLAGS)
+ 
+ libmash.a : $(OBJECTS)
+ 	ar -cr libmash.a $(OBJECTS)
+@@ -49,9 +46,6 @@
+ %.o : %.c++
+ 	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
+ 
+-src/mash/memcpyWrap.o : src/mash/memcpyWrap.c
+-	$(CC) $(CFLAGS) -c -o $@ $<
+-
+ src/mash/capnp/MinHash.capnp.c++ src/mash/capnp/MinHash.capnp.h : src/mash/capnp/MinHash.capnp
+ 	cd src/mash/capnp;@capnp@/bin/capnp compile -oc++ MinHash.capnp
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 47dce94..c235a78 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 hardening.patch
 use_debian_mathjax.patch
+drop_memcpy_wrapper.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mash.git