Your message dated Tue, 14 Sep 2021 15:48:37 +0000
with message-id <[email protected]>
and subject line Bug#978099: fixed in libhdf4 4.2.15-4
has caused the Debian Bug report #978099,
regarding Please add support for riscv64
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
978099: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=978099
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: libhdf4
Version: 4.2.14-1
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: [email protected]
Dear Maintainer,
libhdf4 currently FTBFS on riscv64. William Grant applied a patch in
Ubuntu to add support for the architecture.
Thanks for considering the patch.
Logan
-- System Information:
Debian Release: bullseye/sid
APT prefers groovy-updates
APT policy: (500, 'groovy-updates'), (500, 'groovy-security'), (500,
'groovy'), (100, 'groovy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.8.0-33-generic (SMP w/8 CPU threads)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru libhdf4-4.2.14/debian/patches/64bit
libhdf4-4.2.14/debian/patches/64bit
--- libhdf4-4.2.14/debian/patches/64bit 2019-03-16 04:35:30.000000000 -0400
+++ libhdf4-4.2.14/debian/patches/64bit 2020-04-10 00:44:28.000000000 -0400
@@ -1,14 +1,16 @@
Description: Additional 64bit architectures.
Author: Francesco Paolo Lovergine <[email protected]>
---- a/mfhdf/libsrc/netcdf.h.in
-+++ b/mfhdf/libsrc/netcdf.h.in
+Index: libhdf4-4.2.14/mfhdf/libsrc/netcdf.h.in
+===================================================================
+--- libhdf4-4.2.14.orig/mfhdf/libsrc/netcdf.h.in
++++ libhdf4-4.2.14/mfhdf/libsrc/netcdf.h.in
@@ -293,7 +293,7 @@ typedef double ncdouble;
/*
* Variables/attributes of type NC_LONG should use the C type 'nclong'
*/
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined
__sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined
__powerpc64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined
__sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined
__powerpc64__ || (defined __sparc__ && defined __arch64__) || defined __s390x__
|| defined __aarch64__
++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined
__sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined
__powerpc64__ || (defined __sparc__ && defined __arch64__) || defined __s390x__
|| defined __aarch64__ || (defined __riscv && __riscv_xlen == 64)
/*
* LP64 (also known as 4/8/8) denotes long and pointer as 64 bit types.
* http://www.unix.org/version2/whatsnew/lp64_wp.html
diff -Nru libhdf4-4.2.14/debian/patches/hdfi.h
libhdf4-4.2.14/debian/patches/hdfi.h
--- libhdf4-4.2.14/debian/patches/hdfi.h 2019-03-16 04:35:31.000000000
-0400
+++ libhdf4-4.2.14/debian/patches/hdfi.h 2020-04-10 00:44:28.000000000
-0400
@@ -32,7 +32,7 @@
/* I/O library constants */
#define UNIXUNBUFIO 1
-@@ -288,7 +296,7 @@ typedef int hdf_pint_t;
+@@ -288,7 +296,7 @@
#endif /* IBM6000 */
@@ -41,7 +41,7 @@
#ifndef HP9000
#define HP9000
-@@ -347,6 +355,10 @@ typedef int hdf_pint_t;
+@@ -347,6 +355,10 @@
/* what each does */
#define JMEMSYS MEM_ANSI
@@ -52,7 +52,7 @@
#endif /* HP9000 */
-@@ -666,6 +678,410 @@ typedef int hdf_pint_t;
+@@ -666,6 +678,410 @@
#endif /* !(defined(__APPLE__)) */
/*-----------------------------------------------------*/
@@ -463,7 +463,7 @@
#if defined(NEXT) || defined(NeXT)
#ifndef NEXT
-@@ -928,7 +1344,11 @@ Please check your Makefile.
+@@ -928,7 +1344,11 @@
#include <sys/file.h> /* for unbuffered i/o stuff */
#include <sys/stat.h>
@@ -476,7 +476,7 @@
typedef void VOID;
typedef void *VOIDP;
typedef char *_fcd;
-@@ -952,6 +1372,11 @@ typedef long hdf_pint_t;
+@@ -952,6 +1372,11 @@
#define _fcdtocp(desc) (desc)
#define FILELIB UNIXBUFIO
@@ -488,7 +488,7 @@
/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
/* Determine the memory manager we are going to use. Valid values are: */
-@@ -1097,6 +1522,8 @@ typedef long hdf_pint_t;
+@@ -1097,6 +1522,8 @@
#define _fcdtocp(desc) (desc)
#define FILELIB UNIXBUFIO
@@ -497,7 +497,7 @@
/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
/* Determine the memory manager we are going to use. Valid values are: */
-@@ -1111,6 +1538,66 @@ typedef long hdf_pint_t;
+@@ -1111,6 +1538,66 @@
#endif /* IA64 */
diff -Nru libhdf4-4.2.14/debian/patches/riscv64-support.patch
libhdf4-4.2.14/debian/patches/riscv64-support.patch
--- libhdf4-4.2.14/debian/patches/riscv64-support.patch 1969-12-31
19:00:00.000000000 -0500
+++ libhdf4-4.2.14/debian/patches/riscv64-support.patch 2020-04-10
00:44:28.000000000 -0400
@@ -0,0 +1,84 @@
+Index: libhdf4-4.2.13/hdf/src/hdfi.h
+===================================================================
+--- libhdf4-4.2.13.orig/hdf/src/hdfi.h
++++ libhdf4-4.2.13/hdf/src/hdfi.h
+@@ -83,6 +83,7 @@
+ #define DFMT_X86_64 0x4441
+ #define DFMT_SH 0x4441
+ #define DFMT_SHEB 0x1111
++#define DFMT_RISCV64 0x4441
+
+ /* I/O library constants */
+ #define UNIXUNBUFIO 1
+@@ -1082,6 +1083,58 @@ typedef long hdf_pint_t;
+
+ #endif /* Linux/aarch64 */
+
++#if defined (__linux__) && defined (__riscv) && (__riscv_xlen == 64)
++
++#ifdef GOT_MACHINE
++If you get an error on this line more than one machine type has been defined.
++Please check your Makefile.
++#endif
++#define GOT_MACHINE 1
++
++#include <fcntl.h>
++#include <sys/types.h> /* for unbuffered file I/O */
++#include <sys/stat.h>
++#include <unistd.h>
++#include <ctype.h> /* for character macros */
++
++#define DF_MT DFMT_RISCV64
++
++typedef void VOID;
++typedef void * VOIDP;
++typedef char * _fcd;
++typedef char char8;
++typedef unsigned char uchar8;
++typedef signed char int8;
++typedef unsigned char uint8;
++typedef short int int16;
++typedef unsigned short int uint16;
++typedef int int32;
++typedef unsigned int uint32;
++typedef int intn;
++typedef unsigned int uintn;
++typedef float float32;
++typedef double float64;
++typedef int intf; /* size of INTEGERs in Fortran compiler */
++typedef long hdf_pint_t; /* an integer the same size as a
pointer */
++#define FNAME_POST_UNDERSCORE
++#define _fcdtocp(desc) (desc)
++#define FILELIB UNIXBUFIO
++
++#ifndef BIG_LONGS
++#define BIG_LONGS
++#endif
++
++/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
++
++/* Determine the memory manager we are going to use. Valid values are: */
++/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on
*/
++/* what each does */
++#define JMEMSYS MEM_ANSI
++#define HAVE_STDC
++#define INCLUDES_ARE_ANSI
++
++#endif /* Linux/riscv64 */
++
+ #if defined(NEXT) || defined(NeXT)
+
+ #ifndef NEXT
+Index: libhdf4-4.2.13/hdf/src/hconv.h
+===================================================================
+--- libhdf4-4.2.13.orig/hdf/src/hconv.h
++++ libhdf4-4.2.13/hdf/src/hconv.h
+@@ -59,7 +59,7 @@
+ /* CONSTANT DEFINITIONS
*/
+
/*****************************************************************************/
+ /* Generally Big-Endian machines */
+-#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) &&
!defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) ||
defined(__hpux))) && !defined(__x86_64__) && !(defined(__powerpc__) &&
defined(__LITTLE_ENDIAN__)) && !defined(__aarch64__) && !defined(__ARM_EABI__)
++#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) &&
!defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) ||
defined(__hpux))) && !defined(__x86_64__) && !(defined(__powerpc__) &&
defined(__LITTLE_ENDIAN__)) && !defined(__aarch64__) && !defined(__ARM_EABI__)
&& !defined(__riscv)
+ # define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */
+ # define UI8_OUT DFKnb1b
+ # define SI16_IN DFKnb2b /* S = Signed */
diff -Nru libhdf4-4.2.14/debian/patches/series
libhdf4-4.2.14/debian/patches/series
--- libhdf4-4.2.14/debian/patches/series 2018-07-29 04:56:58.000000000
-0400
+++ libhdf4-4.2.14/debian/patches/series 2020-04-10 00:44:28.000000000
-0400
@@ -15,3 +15,4 @@
spelling-errors.patch
manpage-has-errors-from-man.patch
reproducible-builds.patch
+riscv64-support.patch
diff -Nru libhdf4-4.2.14/debian/rules libhdf4-4.2.14/debian/rules
--- libhdf4-4.2.14/debian/rules 2018-12-11 14:43:50.000000000 -0500
+++ libhdf4-4.2.14/debian/rules 2020-04-10 00:44:28.000000000 -0400
@@ -35,7 +35,7 @@
export DH_VERBOSE
endif
-ifneq (,$(filter $(DEB_BUILD_ARCH),s390x sparc64))
+ifneq (,$(filter $(DEB_BUILD_ARCH),s390x sparc64 riscv64))
DISABLE_TESTS=1
else
DISABLE_TESTS=0
--- End Message ---
--- Begin Message ---
Source: libhdf4
Source-Version: 4.2.15-4
Done: Bas Couwenberg <[email protected]>
We believe that the bug you reported is fixed in the latest version of
libhdf4, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Bas Couwenberg <[email protected]> (supplier of updated libhdf4 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Tue, 14 Sep 2021 17:23:41 +0200
Source: libhdf4
Architecture: source
Version: 4.2.15-4
Distribution: unstable
Urgency: medium
Maintainer: Debian GIS Project <[email protected]>
Changed-By: Bas Couwenberg <[email protected]>
Closes: 978099 994106
Changes:
libhdf4 (4.2.15-4) unstable; urgency=medium
.
* Team upload.
* Bump Standards-Version to 4.6.0, no changes.
* Manually apply changes for riscv64 support.
(closes: #978099)
* Add patch to fix test failures on riscv64.
* Bump debhelper compat to 12, changes:
- Drop --list-missing from dh_install
* Fix FTBFS with TIRPC.
(closes: #994106)
* Cleanup debian/tmp before dh_missing.
Checksums-Sha1:
427406d66627d0cc89de075a6dbe93e884f09bd9 2323 libhdf4_4.2.15-4.dsc
1ad25de3c639a9be61dd863c172927febc2a0ec8 73360 libhdf4_4.2.15-4.debian.tar.xz
26917d27cc5a55ca507679553780a2716ffba70b 9189 libhdf4_4.2.15-4_amd64.buildinfo
Checksums-Sha256:
16811b6ea0337cd3889c8dbc915f3fdf181364f6874b72fc662917aa88e35762 2323
libhdf4_4.2.15-4.dsc
3dff49315c5a6eef1f0be620209b96aa8be62ab6ef52f3874e6561e0a15eb34a 73360
libhdf4_4.2.15-4.debian.tar.xz
3ebbf7e6ee5ef8c041c44df838f523a130f4e5e5499a5a5dc10f2cb889f7dc26 9189
libhdf4_4.2.15-4_amd64.buildinfo
Files:
c24ccb6c770fb96576792cf3f9f2f910 2323 graphics optional libhdf4_4.2.15-4.dsc
02299299c23d40f675416743bce0413b 73360 graphics optional
libhdf4_4.2.15-4.debian.tar.xz
2b79c405034938a0a3c733f53364823d 9189 graphics optional
libhdf4_4.2.15-4_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEgYLeQXBWQI1hRlDRZ1DxCuiNSvEFAmFAwG0ACgkQZ1DxCuiN
SvEdAhAAqPArKCJILmMSti5h6NIMQYfFCGgrIvrRci3KgZQfgdLsLNkpqwZQXIFK
Ca94+XPfy1LhSY04SDgJjN+YDlsXy6BkvzFX3+AGDLXHgDJotb8iG+9iTfJfMQEe
nZ/YQWmoLDNDz726VgEzRcIVWJvDFyqFvJ4s3RuTwmu3uTmSkn5CjgoPCksCwCX0
W9uV+H2BuNtewNQU2L5ndoE2HDGSaK37sIhZ1xL0CuFSMjR66uXrn3LGL+KTdeHz
zfmEvo9y4lkND/BA/yhPgXqAseIdUCo/ZwPu7Tv2aXHWghPl6Ody92j4zYDSj8Jv
xYxN3UTpKUYHCTar74lVMvz70Dd5cjq/3FwWpxFNQfqlj9sAI0IJzgrWgwUXjKq+
2VoMjAcqUyXO150iqEic8wPD4TA+oawQYZ9miHiETZOYRB26mTeSwxd29JTcMmOI
lWO+YnnYczQVo+nvnfTyDYzjRRPN+ypJkK9vCodiEaAHtNxa9W50m0eW0nZHvjL7
YKIL7HXtSZhdIxIUV4lO8zyj7M8NcFDYIa/G/BFP4Lc1AxE3zF0j9FH9yXLd8kkx
ccGi8PWE9rupkia4xryMmVSOOU+YPCFgnPzxf3lG2jW7Q4txTupDzVCCb6yTaSo9
n5OzR+mZa/Gj7y7mV4L/R0CK9rk27hkewC97rLRXRJVEqCzGkPw=
=yIEF
-----END PGP SIGNATURE-----
--- End Message ---
