[med-svn] [phyml] 01/01: Fix gcc-7 issue

Andreas Tille tille at debian.org
Sat Jun 24 14:37:18 UTC 2017


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

tille pushed a commit to branch master
in repository phyml.

commit d0d999ac1eacf2203270a34f7dc9e9bd6b7e019f
Author: Andreas Tille <tille at debian.org>
Date:   Sat Jun 24 16:36:29 2017 +0200

    Fix gcc-7 issue
---
 debian/patches/gcc-7.patch | 16 ++++++++++++++++
 debian/patches/series      |  1 +
 2 files changed, 17 insertions(+)

diff --git a/debian/patches/gcc-7.patch b/debian/patches/gcc-7.patch
new file mode 100644
index 0000000..5f0c85e
--- /dev/null
+++ b/debian/patches/gcc-7.patch
@@ -0,0 +1,16 @@
+Author: Thomas Schmitt <scdbackup at gmx.net>
+Last-Update: Sat, 24 Jun 2017 15:29:56 +0200
+Description: the compiler wants {}-brackets around the scalar value
+             when it shall initialize a vector
+
+--- a/src/lk.c
++++ b/src/lk.c
+@@ -2261,7 +2261,7 @@ void Update_PMat_At_Given_Edge(t_edge *b
+       //
+       len = MAX(0.0, b_fcus->l->v) * tree->mod->br_len_mult->v;
+       int p_matrices[1]     = b_fcus->Pij_rr_idx;
+-      double branch_lens[1] = len;
++      double branch_lens[1] = { len };
+       int ret = beagleUpdateTransitionMatrices(tree->b_inst,0,p_matrices,NULL,NULL,branch_lens,1);
+       if(ret<0)
+         {
diff --git a/debian/patches/series b/debian/patches/series
index dbb6e17..145a00f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ no-stdc++.patch
 no-configure-ac-date.patch
 fix_declaration_of_temp.patch
 # fix_wrong_initialisation_of_array.patch
+gcc-7.patch

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



More information about the debian-med-commit mailing list