[med-svn] [harvest-tools] 05/06: Adapt patches

[Andreas Tille]

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

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

commit fecbc6f0581717a408dcd989dab1da98f1b87cf9
Author: Andreas Tille <tille at debian.org>
Date:   Fri Oct 21 11:12:53 2016 +0200

    Adapt patches
---
 debian/patches/remove_memwrap.patch | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/remove_memwrap.patch b/debian/patches/remove_memwrap.patch
index c35e6b9..6d9a93b 100644
--- a/debian/patches/remove_memwrap.patch
+++ b/debian/patches/remove_memwrap.patch
@@ -4,17 +4,17 @@ Description: remove the mmemcpy wrapper and the intermediate library
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -4,9 +4,6 @@
+@@ -4,9 +4,6 @@ UNAME_S=$(shell uname -s)
  
  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
+-	CXXFLAGS += -include src/harvest/memcpyLink.h -Wl,--wrap=memcpy
 -	CFLAGS += -include src/harvest/memcpyLink.h
  endif
  
  SOURCES=\
-@@ -23,14 +20,11 @@
+@@ -23,14 +20,11 @@ SOURCES=\
  
  OBJECTS=$(SOURCES:.cpp=.o) src/harvest/pb/harvest.pb.o src/harvest/capnp/harvest.capnp.o
  
@@ -32,25 +32,25 @@ Description: remove the mmemcpy wrapper and the intermediate library
  
  .SUFFIXES :
  
-@@ -43,16 +37,13 @@
+@@ -43,16 +37,13 @@ libharvest.a : $(OBJECTS)
  %.o : %.cc
  	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
  
 -src/harvest/memcpyWrap.o : src/harvest/memcpyWrap.c
--	$(CC) -c -o $@ $<
+-	$(CC) $(CFLAGS) -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
+ 	cd src/harvest/capnp;export PATH=@capnp@/bin/:${PATH};capnp compile -I @capnp@/include -oc++ harvest.capnp
  
 -install : libharvest.a
 +install : harvesttools
  	mkdir -p @prefix@/bin/
  	mkdir -p @prefix@/lib/
  	mkdir -p @prefix@/include/
-@@ -60,7 +51,6 @@
+@@ -60,7 +51,6 @@ install : libharvest.a
  	mkdir -p @prefix@/include/harvest/capnp
  	mkdir -p @prefix@/include/harvest/pb
  	ln -sf `pwd`/harvesttools @prefix@/bin/
@@ -58,7 +58,7 @@ Description: remove the mmemcpy wrapper and the intermediate library
  	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 @@
+@@ -76,7 +66,6 @@ install : libharvest.a
  
  clean :
  	-rm harvesttools

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