[Git][debian-gis-team/hdf4][master] Add patch to fix test failures on riscv64.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / hdf4


Commits:
63ef6895 by Bas Couwenberg at 2020-12-27T07:06:49+01:00
Add patch to fix test failures on riscv64.

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/riscv64.diff
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -4,6 +4,7 @@ libhdf4 (4.2.15-4) UNRELEASED; urgency=medium
   * Bump Standards-Version to 4.5.1, no changes.
   * Manually apply changes for riscv64 support.
     (closes: #978099)
+  * Add patch to fix test failures on riscv64.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 28 Nov 2020 13:42:15 +0100
 


=====================================
debian/patches/riscv64.diff
=====================================
@@ -0,0 +1,26 @@
+Description: Fix tests for riscv64.
+Author: Aurelien Jarno <aurelien at aurel32.net>
+Bug-Debian: https://bugs.debian.org/978099
+
+--- a/mfhdf/ncgen/ncgen.l
++++ b/mfhdf/ncgen/ncgen.l
+@@ -113,7 +113,7 @@ FloatInf|Infinity|Inf    {    /* float m
+             yyerror(errstr);
+         }
+ 
+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ || defined __aarch64__
++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __s390x__ || defined __aarch64__ || (defined __riscv && __riscv_xlen == 64)
+         if (dd < INT_MIN  ||  dd > INT_MAX)
+ #else
+         if (dd < LONG_MIN  ||  dd > LONG_MAX)
+--- a/mfhdf/ncgen/ncgenyy.c
++++ b/mfhdf/ncgen/ncgenyy.c
+@@ -991,7 +991,7 @@ YY_RULE_SETUP
+             yyerror(errstr);
+         }
+ 
+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__
++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ || (defined __riscv && __riscv_xlen == 64)
+         if (dd < INT_MIN  ||  dd > INT_MAX)
+ #else
+         if (dd < LONG_MIN  ||  dd > LONG_MAX)


=====================================
debian/patches/series
=====================================
@@ -15,3 +15,4 @@ mips64.diff
 spelling-errors.patch
 manpage-has-errors-from-man.patch
 reproducible-builds.patch
+riscv64.diff


=====================================
debian/rules
=====================================
@@ -37,7 +37,7 @@ ifneq (,$(findstring verbose,$(DEB_BUILD_OPTIONS)))
    export DH_VERBOSE
 endif
 
-ifneq (,$(filter $(DEB_BUILD_ARCH),s390x riscv64 sparc64))
+ifneq (,$(filter $(DEB_BUILD_ARCH),s390x sparc64))
    DISABLE_TESTS=1
 else
    DISABLE_TESTS=0



View it on GitLab: https://salsa.debian.org/debian-gis-team/hdf4/-/commit/63ef689515af456b523a3bab35f037b4c4b6abb9

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/hdf4/-/commit/63ef689515af456b523a3bab35f037b4c4b6abb9
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20201227/b412835a/attachment-0001.html>