[med-svn] [seqtools] 03/09: Dynamic linking test; avoid blatSrc

[Andreas Tille]

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

tille pushed a commit to branch master
in repository seqtools.

commit 3ad71ef2c3fc368d1c72228c322a96faa02eb164
Author: Andreas Tille <tille at debian.org>
Date:   Wed Oct 25 14:23:38 2017 +0200

    Dynamic linking test; avoid blatSrc
---
 debian/patches/dynamic-lib.patch              | 11 +++++++++++
 debian/patches/prevent_usage_of_blatsrc.patch | 16 ++++++++++++++++
 debian/patches/series                         |  1 +
 debian/rules                                  |  7 +------
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/debian/patches/dynamic-lib.patch b/debian/patches/dynamic-lib.patch
index e505379..206c35c 100644
--- a/debian/patches/dynamic-lib.patch
+++ b/debian/patches/dynamic-lib.patch
@@ -15,3 +15,14 @@ Description: Create dynamic library
  
  LT_LANG([C++])
  
+--- a/belvuApp/Makefile.am
++++ b/belvuApp/Makefile.am
+@@ -19,7 +19,7 @@ belvu_LDADD = $(top_builddir)/seqtoolsUt
+ 
+ # If gbtools is in a subdirectory, add it; otherwise look for a local installation
+ if USE_GBTOOLS
+-belvu_LDADD += $(top_builddir)/gbtools/.libs/libgbtools.a        
++belvu_LDADD += -L$(top_builddir)/gbtools/.libs -lgbtools
+ else
+ belvu_LDADD += -lgbtools
+ endif
diff --git a/debian/patches/prevent_usage_of_blatsrc.patch b/debian/patches/prevent_usage_of_blatsrc.patch
new file mode 100644
index 0000000..5c86058
--- /dev/null
+++ b/debian/patches/prevent_usage_of_blatsrc.patch
@@ -0,0 +1,16 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 19 Oct 2017 16:27:56 +0200
+Description: Dirty trick to always assume HAVE_BLATSRC_DEPS=0 and thus never
+ use blatSrc
+
+--- a/gbtools/configure.ac
++++ b/gbtools/configure.ac
+@@ -95,7 +95,7 @@ AM_CONDITIONAL([USE_LIBCURL], [test "$HA
+ 
+ 
+ # Check for the blatSrc library deps. Again, optional.
+-AC_CHECK_HEADERS([stdio.h stdlib.h stdarg.h ctype.h sys/types.h sys/stat.h strings.h fcntl.h assert.h setjmp.h time.h math.h errno.h unistd.h libgen.h sys/wait.h mingw/math.h sys/socket.h netinet/in.h arpa/inet.h netdb.h pthread.h regex.h signal.h execinfo.h limits.h sys/mman.h syslog.h sys/time.h dirent.h sys/utsname.h sys/statvfs.h pwd.h termios.h utime.h io.h direct.h ieeefp.h sys/file.h zlib.h], [HAVE_BLATSRC_DEPS=1], [HAVE_BLATSRC_DEPS=0])
++AC_CHECK_HEADERS([stdio.h stdlib.h stdarg.h ctype.h sys/types.h sys/stat.h strings.h fcntl.h assert.h setjmp.h time.h math.h errno.h unistd.h libgen.h sys/wait.h mingw/math.h sys/socket.h netinet/in.h arpa/inet.h netdb.h pthread.h regex.h signal.h execinfo.h limits.h sys/mman.h syslog.h sys/time.h dirent.h sys/utsname.h sys/statvfs.h pwd.h termios.h utime.h io.h direct.h ieeefp.h sys/file.h zlib.h], [HAVE_BLATSRC_DEPS=0], [HAVE_BLATSRC_DEPS=0])
+ AM_CONDITIONAL([USE_BLATSRC], [test "$HAVE_BLATSRC_DEPS" -eq 1])
+ AM_COND_IF([USE_BLATSRC], [ echo 'blatSrc is available!' ])
+ AM_COND_IF([USE_BLATSRC], [AC_DEFINE([USE_BLATSRC], [1], [Define to 1 if blatSrc deps are available])])
diff --git a/debian/patches/series b/debian/patches/series
index 1636a66..c6bf00c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 dynamic-lib.patch
+prevent_usage_of_blatsrc.patch
diff --git a/debian/rules b/debian/rules
index 62983db..0ec86ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 # DH_VERBOSE := 1
-export LC_ALL=C.UTF-8
 
 include /usr/share/dpkg/default.mk
 # this provides:
@@ -12,11 +11,7 @@ include /usr/share/dpkg/default.mk
 # DEB_VERSION_UPSTREAM: the package's upstream version
 # DEB_DISTRIBUTION: the distribution(s) listed in the current entry of debian/changelog
 
-# for hardening you might like to uncomment this:
-# export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
 	dh $@
-
-#get-orig-source:
-#	. debian/get-orig-source

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