[med-svn] [fast5] 06/07: Fix source build in autopkgtest

[Afif Elghraoui]

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

afif pushed a commit to branch master
in repository fast5.

commit fbc276d608944b567b7e99729ba61f24848b43ad
Author: Afif Elghraoui <afif at debian.org>
Date:   Sat Oct 7 00:04:11 2017 -0400

    Fix source build in autopkgtest
    
    Closes: #876283
---
 debian/patches/series      |  1 +
 debian/patches/vpath.patch | 21 +++++++++++++++++++++
 debian/tests/control       |  4 +++-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/debian/patches/series b/debian/patches/series
index da8b790..81052c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 rpath.patch
+vpath.patch
diff --git a/debian/patches/vpath.patch b/debian/patches/vpath.patch
new file mode 100644
index 0000000..27024bf
--- /dev/null
+++ b/debian/patches/vpath.patch
@@ -0,0 +1,21 @@
+Description: Use VPATH to set prerequisites of fast5 headers
+ This makes it possible to change the location of the headers while
+ still keeping them as prerequisites in the Makefile.
+Author: Afif Elghraoui <afif at debian.org>
+Forwarded: no
+Last-Update: 2017-10-06
+--- fast5.orig/src/Makefile
++++ fast5/src/Makefile
+@@ -19,9 +19,11 @@
+ HPPTOOLS_DIR ?= hpptools
+ FAST5_DIR ?= ${CURDIR}/../include
+ 
++VPATH += ${FAST5_DIR}
++
+ TARGETS = f5ls f5ls-full hdf5-mod f5-mod
+ EXTRA_TARGETS = f5dump f5pack
+-HPP_FILES := $(addprefix ${FAST5_DIR}/, fast5.hpp fast5/hdf5_tools.hpp fast5/Huffman_Packer.hpp fast5/Bit_Packer.hpp)
++HPP_FILES := fast5.hpp fast5/hdf5_tools.hpp fast5/Huffman_Packer.hpp fast5/Bit_Packer.hpp
+ 
+ CXXFLAGS := -std=c++11 -O0 -g3 -ggdb -fno-eliminate-unused-debug-types -Wall -Wextra -Wpedantic
+ CPPFLAGS := -isystem ${HDF5_INCLUDE_DIR} -I $(FAST5_DIR)
diff --git a/debian/tests/control b/debian/tests/control
index d9427c8..474a4b3 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,7 +1,9 @@
 Test-Command:
 	cp /usr/share/doc/libfast5-dev/examples/* $ADTTMP
 	&& cd $ADTTMP
-	&& make
+	&& make VPATH=/usr/include
+	HDF5_INCLUDE_DIR=/usr/include/hdf5/serial
+	HDF5_LIB_DIR=/usr/lib/$(gcc -print-multiarch)/hdf5/serial
 Depends:
 	build-essential,
 	libfast5-dev,

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