[med-svn] [bcftools] 01/01: Try hard to build with htslib but failed so far

[Andreas Tille]

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

tille pushed a commit to branch master
in repository bcftools.

commit 7b223d7e3be869b8cb027786c5b66605db932e28
Author: Andreas Tille <tille at debian.org>
Date:   Thu Jul 20 16:37:48 2017 +0200

    Try hard to build with htslib but failed so far
---
 debian/control                     |  1 +
 debian/patches/fix_config.mk.patch | 11 +++++++++++
 debian/patches/series              |  1 +
 debian/rules                       |  3 +++
 4 files changed, 16 insertions(+)

diff --git a/debian/control b/debian/control
index b78dd15..3423f5d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders:
 	Afif Elghraoui <afif at debian.org>
 Build-Depends:
 	debhelper (>= 10),
+        autoconf-archive,
 	zlib1g-dev,
 	libhts-dev (>= 1.5),
 	libgsl-dev,
diff --git a/debian/patches/fix_config.mk.patch b/debian/patches/fix_config.mk.patch
new file mode 100644
index 0000000..3f80c2c
--- /dev/null
+++ b/debian/patches/fix_config.mk.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -81,7 +81,7 @@ ALL_LIBS     = -lz -ldl $(LIBS)
+ # Usually config.mk and config.h are generated by running configure
+ # or config.status, but if those aren't used create defaults here.
+ config.mk:
+-	@sed -e '/^prefix/,/^PLUGIN_EXT/d;s/@Hsource@//;s/@Hinstall@/#/;s#@HTSDIR@#../htslib#g;s/@HTSLIB_CPPFLAGS@/-I$$(HTSDIR)/g;' config.mk.in > $@
++	@sed -e '/^prefix/,/^PLUGIN_EXT/d;s/@Hsource@//;s/@Hinstall@/#/;s#@HTSDIR@#/usr/lib/htslib#g;s#@HTSLIB_CPPFLAGS@#-I/usr/include#g;' config.mk.in > $@
+ 
+ config.h:
+ 	echo '/* Basic config.h generated by Makefile */' > $@
diff --git a/debian/patches/series b/debian/patches/series
index b4ead10..7df1fc6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 # destdir.patch
 tests-pluginpath.patch
 test-regidx-unsigned-char.patch
+fix_config.mk.patch
diff --git a/debian/rules b/debian/rules
index 4d430c0..00beee4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,3 +18,6 @@ override_dh_auto_clean:
 	dh_auto_clean || true
 	# now it is created but should vanish
 	rm -f config.mk
+
+override_dh_auto_configure:
+	dh_auto_configure -- --with-htslib=/usr/lib/htslib

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