[emos] 01/01: * Build fix for SIGN() real type problem on kFreeBSD in csect4.F * Disable tests to allow emos to proceed for gcc5 transition; working on the issue (see #793955) with upstream; code in question is obsolete and being removed.

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/2%4.0.7-4
in repository emos.

commit e93b6d1d19e043a12c7c71faa764c56a06966f1f
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Aug 27 10:35:16 2015 +0100

    * Build fix for SIGN() real type problem on kFreeBSD in csect4.F
    * Disable tests to allow emos to proceed for gcc5 transition;
      working on the issue (see #793955) with upstream;
      code in question is obsolete and being removed.
---
 debian/changelog                 | 14 ++++++++++----
 debian/patches/build_fixes.patch | 11 ++++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e3ae1ee..6322627 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
+emoslib (2:4.0.7-4) unstable; urgency=medium
+
+  * Build fix for SIGN() real type problem on kFreeBSD in csect4.F 
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Sat, 15 Aug 2015 17:09:48 +0100
+
 emoslib (2:4.0.7-3) unstable; urgency=medium
 
-  * Disable tests that FTBFS on some archs to allow transitions. 
-    Currently working on the problems with upstream; some refer 
-    to obsolete code which is being removed.
+  * Disable tests to allow emos to proceed for gcc5 transition; 
+    working on the issue (see #793955) with upstream;
+    code in question is obsolete and being removed. 
 
- -- Alastair McKinstry <mckinstry at debian.org>  Wed, 05 Aug 2015 08:15:42 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Fri, 07 Aug 2015 19:23:44 +0100
 
 emoslib (2:4.0.7-2) experimental; urgency=medium
 
diff --git a/debian/patches/build_fixes.patch b/debian/patches/build_fixes.patch
index 5b83740..2dfc856 100644
--- a/debian/patches/build_fixes.patch
+++ b/debian/patches/build_fixes.patch
@@ -7,15 +7,20 @@ Index: emoslib-4.0.7/gribex/csect4.F
 ===================================================================
 --- emoslib-4.0.7.orig/gribex/csect4.F
 +++ emoslib-4.0.7/gribex/csect4.F
-@@ -304,7 +304,7 @@ C     Calculate the scale and reference
+@@ -304,10 +304,10 @@ C     Calculate the scale and reference
  #endif
  #if defined hpR32 || defined (__alpha) || defined hpR64 || defined hpiaR64
        ISCALE = MIN (INT(ZS),INT(ZS+DSIGN(1.0D0,ZS)))
 -#elif defined (linux) || defined (darwin)
+-      ISCALE = MIN (INT(ZS),INT(ZS+SIGN(1.D0,ZS)))
 +#elif defined (linux) || defined (darwin) || defined(__GNU__)
-       ISCALE = MIN (INT(ZS),INT(ZS+SIGN(1.D0,ZS)))
++      ISCALE = MIN (INT(ZS),INT(ZS+SIGN(REAL(1.D0),REAL(ZS))))
  #else
-       ISCALE = MIN (INT(ZS),INT(ZS+SIGN(1.,ZS)))
+-      ISCALE = MIN (INT(ZS),INT(ZS+SIGN(1.,ZS)))
++      ISCALE = MIN (INT(ZS),INT(ZS+SIGN(REAL(1.),REAL(ZS))))
+ #endif
+       ZSCALE = 2.0**ISCALE
+ C 
 Index: emoslib-4.0.7/CMakeLists.txt
 ===================================================================
 --- emoslib-4.0.7.orig/CMakeLists.txt

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/emos.git