[med-svn] [khmer] 04/04: Autopkgtest is making use of third-party header file - install this into liboxli-dev package and add according -I directive to test
Andreas Tille
tille at debian.org
Fri Dec 15 12:58:41 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository khmer.
commit 819205c139c1cbe75ed614702220fd8891e0e5be
Author: Andreas Tille <tille at debian.org>
Date: Fri Dec 15 13:58:23 2017 +0100
Autopkgtest is making use of third-party header file - install this into liboxli-dev package and add according -I directive to test
---
debian/changelog | 3 +++
debian/liboxli-dev.install | 1 +
debian/tests/test-liboxli-dev | 4 ++--
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a513075..6a1b48a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ khmer (2.1.2+dfsg-2) UNRELEASED; urgency=medium
* debhelper 10
* Specify compression option from d/rules directly inside watch file
* Fix clean target ba removing possibly existing __pycache__ and .eggs
+ * Autopkgtest is making use of third-party header file - install this into
+ liboxli-dev package and add according -I directive to test
+ Closes: #851830
-- Andreas Tille <tille at debian.org> Fri, 15 Dec 2017 13:29:25 +0100
diff --git a/debian/liboxli-dev.install b/debian/liboxli-dev.install
index ba339dc..573d553 100755
--- a/debian/liboxli-dev.install
+++ b/debian/liboxli-dev.install
@@ -4,3 +4,4 @@ src/oxli/oxli.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
src/oxli/liboxli.so usr/lib/${DEB_HOST_MULTIARCH}
# NB: we install the headers to the oxli subdir.
include/oxli/*.hh usr/include/oxli
+third-party/smhasher/MurmurHash3.h usr/include/oxli/smhasher
diff --git a/debian/tests/test-liboxli-dev b/debian/tests/test-liboxli-dev
index bcf2ac4..88c788c 100644
--- a/debian/tests/test-liboxli-dev
+++ b/debian/tests/test-liboxli-dev
@@ -6,12 +6,12 @@ if [ "$ADTTMP" = "" ] ; then
fi
cd $ADTTMP
-c++ -o test-prog-static -static -std=c++11 `pkg-config oxli --static --cflags` \
+c++ -o test-prog-static -static -std=c++11 `pkg-config oxli --static --cflags` -I/usr/include/oxli/smhasher \
/usr/share/doc/khmer-common/test-compile.cc `pkg-config oxli --static --libs`
./test-prog-static
-c++ -o test-prog-dynamic -std=c++11 `pkg-config oxli --cflags` \
+c++ -o test-prog-dynamic -std=c++11 `pkg-config oxli --cflags` -I/usr/include/oxli/smhasher \
/usr/share/doc/khmer-common/test-compile.cc `pkg-config oxli --libs`
./test-prog-dynamic
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/khmer.git
More information about the debian-med-commit
mailing list