[med-svn] [trinityrnaseq] 01/01: fix build on GCC6

[Sascha Steinbiss]

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

satta pushed a commit to branch master
in repository trinityrnaseq.

commit b1f8d6f5158e96cee6c29c69f57e4309b20ea264
Author: Sascha Steinbiss <satta at debian.org>
Date:   Fri Aug 5 19:13:24 2016 +0000

    fix build on GCC6
---
 debian/changelog                     |  7 +++++++
 debian/patches/build_with_gcc6.patch | 17 +++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ee021e8..39ab232 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+trinityrnaseq (2.2.0+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fix build on GCC 6 (Closes: #831110)
+
+ -- Sascha Steinbiss <satta at debian.org>  Fri, 05 Aug 2016 19:21:49 +0000
+
 trinityrnaseq (2.2.0+dfsg-1) unstable; urgency=medium
 
   [ Andreas Tille ]
diff --git a/debian/patches/build_with_gcc6.patch b/debian/patches/build_with_gcc6.patch
new file mode 100644
index 0000000..cb086f7
--- /dev/null
+++ b/debian/patches/build_with_gcc6.patch
@@ -0,0 +1,17 @@
+Description: fix building with GCC 6
+ Upstream handles GCC versions separately in their Makefile
+ but didn't consider version 6. Cloning settings for GCC 5 to use
+ with GCC 6, works.
+Author: Sascha Steinbiss <satta at debian.org>
+--- a/Chrysalis/Makefile
++++ b/Chrysalis/Makefile
+@@ -306,6 +306,9 @@
+   ifeq ($(GPP_MAJOR_VERSION),5)
+        SYS_INCS        = -iquote . $(XERCES_INC)
+   endif
++  ifeq ($(GPP_MAJOR_VERSION),6)
++       SYS_INCS        = -iquote . $(XERCES_INC)
++  endif
+ endif
+ 
+ # Linking control (e.g. to link templates):
diff --git a/debian/patches/series b/debian/patches/series
index 479b088..005dc7e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ collections15-to-4
 fix_system_paths
 disable-version-check
 adjust-trimmomatic-adapters-path
+build_with_gcc6.patch

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