From 789435221bf74332c4b3a54f50e170845bb97ec6 Mon Sep 17 00:00:00 2001
From: Petar Petrov
Date: Tue, 15 Sep 2020 08:26:50 +0700
Subject: academic/PhyMLR: Updated for version 3.3.20200621.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 academic/PhyML/PhyML.SlackBuild | 12 +++++++-----
 academic/PhyML/PhyML.info       |  6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'academic')

diff --git a/academic/PhyML/PhyML.SlackBuild b/academic/PhyML/PhyML.SlackBuild
index bddb063c00..893454e123 100644
--- a/academic/PhyML/PhyML.SlackBuild
+++ b/academic/PhyML/PhyML.SlackBuild
@@ -25,7 +25,7 @@
 # Thanks to Niels Horn for some handy modifications and corrections.
 
 PRGNAM=PhyML
-VERSION=${VERSION:-3.3.20190909}
+VERSION=${VERSION:-3.3.20200621}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -89,7 +89,9 @@ find -L . \
 # Use our CFLAGS
 sed -i "/^CFLAGS/s/=/+=/" Makefile src/Makefile
 
-CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
+# The -mfma flag is needed for building on 14.2. Help is from here:
+# https://github.com/horovod/horovod/issues/1832
+CFLAGS="$SLKCFLAGS -mfma" CXXFLAGS="$SLKCFLAGS -mfma" make
 make install DESTDIR=$PKG
 
 # This is PhyML MPI. If you do not want it, comment the lines below. Then you do
@@ -108,7 +110,7 @@ make install DESTDIR=$PKG
 # Use our CFLAGS
 sed -i "/^CFLAGS/s/=/+=/" Makefile src/Makefile
 
-CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
+CFLAGS="$SLKCFLAGS -mfma" CXXFLAGS="$SLKCFLAGS -mfma" make
 make install DESTDIR=$PKG
 
 # This is Phyrex
@@ -126,7 +128,7 @@ make install DESTDIR=$PKG
 # Use our CFLAGS
 sed -i "/^CFLAGS/s/=/+=/" Makefile src/Makefile
 
-CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
+CFLAGS="$SLKCFLAGS -mfma" CXXFLAGS="$SLKCFLAGS -mfma" make
 make install DESTDIR=$PKG
 
 # This is PhyTime
@@ -144,7 +146,7 @@ make install DESTDIR=$PKG
 # Use our CFLAGS
 sed -i "/^CFLAGS/s/=/+=/" Makefile src/Makefile
 
-CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
+CFLAGS="$SLKCFLAGS -mfma" CXXFLAGS="$SLKCFLAGS -mfma" make
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/academic/PhyML/PhyML.info b/academic/PhyML/PhyML.info
index f44eaca3de..ec04310e99 100644
--- a/academic/PhyML/PhyML.info
+++ b/academic/PhyML/PhyML.info
@@ -1,8 +1,8 @@
 PRGNAM="PhyML"
-VERSION="3.3.20190909"
+VERSION="3.3.20200621"
 HOMEPAGE="https://github.com/stephaneguindon/phyml/"
-DOWNLOAD="https://github.com/stephaneguindon/phyml/archive/v3.3.20190909/phyml-3.3.20190909.tar.gz"
-MD5SUM="35698ff61c1db57b238f5b2d2cc784b3"
+DOWNLOAD="https://github.com/stephaneguindon/phyml/archive/v3.3.20200621/phyml-3.3.20200621.tar.gz"
+MD5SUM="12622e111c388bcb16696660033143b5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openmpi"
-- 
cgit v1.2.3