[med-svn] [harvest-tools] 01/02: Add patch to remove memcpyWarp and build executable without lib

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository harvest-tools.

commit 1864e6f23271a13f2dabb16f136b71ecfb5c710a
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Thu Apr 14 17:38:25 2016 +0000

    Add patch to remove memcpyWarp and build executable without lib
---
 debian/patches/remove_memwrap.patch | 68 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 69 insertions(+)

diff --git a/debian/patches/remove_memwrap.patch b/debian/patches/remove_memwrap.patch
new file mode 100644
index 0000000..c35e6b9
--- /dev/null
+++ b/debian/patches/remove_memwrap.patch
@@ -0,0 +1,68 @@
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Last-Update: Thu, 14 Apr 2016 19:46:15 +0100
+Description: remove the mmemcpy wrapper and the intermediate library
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -4,9 +4,6 @@
+ 
+ ifeq ($(UNAME_S),Darwin)
+ 	CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++
+-else
+-	CXXFLAGS += -include src/harvest/memcpyLink.h -L. -static-libstdc++  -Wl,--wrap=memcpy
+-	CFLAGS += -include src/harvest/memcpyLink.h
+ endif
+ 
+ SOURCES=\
+@@ -23,14 +20,11 @@
+ 
+ OBJECTS=$(SOURCES:.cpp=.o) src/harvest/pb/harvest.pb.o src/harvest/capnp/harvest.capnp.o
+ 
+-all : harvesttools libharvest.a
++all : harvesttools
+ 
+-harvesttools : libharvest.a src/harvest/memcpyWrap.o
+-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o harvesttools src/harvest/memcpyWrap.o libharvest.a -lprotobuf -lcapnp -lkj -lstdc++ -lz -lm -lpthread $(LDFLAGS)
++harvesttools : $(OBJECTS)
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@  $? -lprotobuf -lcapnp -lkj -lstdc++ -lz -lm -lpthread $(LDFLAGS)
+ 
+-libharvest.a : $(OBJECTS)
+-	ar -cr libharvest.a $(OBJECTS)
+-	ranlib libharvest.a
+ 
+ .SUFFIXES :
+ 
+@@ -43,16 +37,13 @@
+ %.o : %.cc
+ 	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
+ 
+-src/harvest/memcpyWrap.o : src/harvest/memcpyWrap.c
+-	$(CC) -c -o $@ $<
+-
+ src/harvest/pb/harvest.pb.cc src/harvest/pb/harvest.pb.h : src/harvest/pb/harvest.proto
+ 	cd src; @protobuf@/bin/protoc --cpp_out . harvest/pb/harvest.proto
+ 
+ src/harvest/capnp/harvest.capnp.c++ src/harvest/capnp/harvest.capnp.h : src/harvest/capnp/harvest.capnp
+ 	cd src/harvest/capnp;@capnp@/bin/capnp compile -oc++ harvest.capnp
+ 
+-install : libharvest.a
++install : harvesttools
+ 	mkdir -p @prefix@/bin/
+ 	mkdir -p @prefix@/lib/
+ 	mkdir -p @prefix@/include/
+@@ -60,7 +51,6 @@
+ 	mkdir -p @prefix@/include/harvest/capnp
+ 	mkdir -p @prefix@/include/harvest/pb
+ 	ln -sf `pwd`/harvesttools @prefix@/bin/
+-	ln -sf `pwd`/libharvest.a @prefix@/lib/
+ 	ln -sf `pwd`/src/harvest/exceptions.h @prefix@/include/harvest/
+ 	ln -sf `pwd`/src/harvest/HarvestIO.h @prefix@/include/harvest/
+ 	ln -sf `pwd`/src/harvest/capnp/harvest.capnp.h @prefix@/include/harvest/capnp/
+@@ -76,7 +66,6 @@
+ 
+ clean :
+ 	-rm harvesttools
+-	-rm libharvest.a
+ 	-rm src/harvest/*.o
+ 	-rm src/harvest/capnp/*.o
+ 	-rm src/harvest/capnp/*.c++
diff --git a/debian/patches/series b/debian/patches/series
index cc43886..e4d8f46 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix_readme_in_setup.patch
 dynamic_linking.patch
 hardening.patch
+remove_memwrap.patch

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