<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/96e97e5126e54fbddf51ca1049fe8d773f1f9f1a">https://github.com/macports/macports-ports/commit/96e97e5126e54fbddf51ca1049fe8d773f1f9f1a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 96e97e5126e hdf4: Fix test and runtime failures on arm64
</span>96e97e5126e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 96e97e5126e54fbddf51ca1049fe8d773f1f9f1a
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Apr 16 01:27:09 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> hdf4: Fix test and runtime failures on arm64
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62341
</span>---
science/hdf4/Portfile | 6 +-
science/hdf4/files/arm64.patch | 225 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 228 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdf4/Portfile b/science/hdf4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 61071304350..1d87150a201 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/hdf4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdf4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,7 @@ PortGroup compilers 1.0
</span>
name hdf4
version 4.2.15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories science
license NCSA
maintainers {takeshi @tenomoto}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +39,8 @@ patchfiles patch-configure.diff \
</span> patch-mfhdf-test-tncvargetfill.c.diff \
patch-mfhdf-test-tsd.c.diff \
patch-mfhdf-test-tszip.c.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-hdf-test-mgr.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-hdf-test-mgr.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arm64.patch
</span>
configure.args --disable-netcdf --disable-fortran \
--with-jpeg=${prefix} --enable-shared \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdf4/files/arm64.patch b/science/hdf4/files/arm64.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a0a8b111e5b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdf4/files/arm64.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,225 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix test failures and runtime errors on arm64 systems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hdf/src/hconv.h.orig 2020-03-03 11:40:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hdf/src/hconv.h 2022-04-16 00:31:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,7 +59,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* CONSTANT DEFINITIONS */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*****************************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Generally Big-Endian machines */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__aarch64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define UI8_OUT DFKnb1b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define SI16_IN DFKnb2b /* S = Signed */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mfhdf/fortran/jackets.c.in.orig 2020-03-03 11:40:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mfhdf/fortran/jackets.c.in 2022-04-16 00:19:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct ncfils { /* This will be a common block from Fortran */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double dd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ll;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long ll;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,7 +65,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct ncfils { /* This will be a common block from Fortran */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double dd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ll;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long ll;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -420,7 +420,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* FORTRAN_HAS_NO_SHORT */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Convert multi-dimensional array of NCLONGs stored in ints to packed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * array of longs, in malloc'ed space. Returns pointer to longs or NULL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -908,7 +908,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } /* else */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* FORTRAN_HAS_NO_SHORT */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HDF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long longs = *(int *)value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1022,7 +1022,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } /* else */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* FORTRAN_HAS_NO_SHORT */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HDF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long *longs = itol (value, ncount, ndims);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1133,7 +1133,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmpbasis = nctypelen(NC_LONG);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (datatype == NC_LONG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmpbasis = sizeof(int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1190,7 +1190,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } /* else */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* FORTRAN_HAS_NO_SHORT */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HDF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long *longs = itolg (value, ncount, nbasis, ndims);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1326,7 +1326,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } /* else */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* FORTRAN_HAS_NO_SHORT */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HDF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long longs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1468,7 +1468,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } /* else */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* FORTRAN_HAS_NO_SHORT */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HDF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long iocount = dimprod (ncount, ndims); /* product of dimensions */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1606,7 +1606,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmpbasis = nctypelen(NC_LONG);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (datatype == NC_LONG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmpbasis = sizeof(int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1677,7 +1677,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } /* else */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* FORTRAN_HAS_NO_SHORT */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HDF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long iocount = dimprod (ncount, ndims); /* product of dimensions */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1843,7 +1843,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } /* else */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* FORTRAN_HAS_NO_SHORT */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HDF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long *longs = itol (value, attlen, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2008,7 +2008,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } /* else */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* FORTRAN_HAS_NO_SHORT */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HDF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mfhdf/libsrc/netcdf.h.in.orig 2020-03-03 11:40:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mfhdf/libsrc/netcdf.h.in 2022-04-16 00:17:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -293,7 +293,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Variables/attributes of type NC_LONG should use the C type 'nclong'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * LP64 (also known as 4/8/8) denotes long and pointer as 64 bit types.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * http://www.unix.org/version2/whatsnew/lp64_wp.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mfhdf/libsrc/putget.c.orig 2020-03-03 11:40:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mfhdf/libsrc/putget.c 2022-04-16 00:27:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -665,7 +665,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case NC_SHORT :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return( xdr_NCvshort(xdrs, (unsigned)rem/2, (short *)values) ) ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case NC_LONG :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return( xdr_int(xdrs, (nclong *)values) ) ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return( xdr_long(xdrs, (nclong *)values) ) ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mfhdf/libsrc/xdrposix.c.orig 2020-03-03 11:40:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mfhdf/libsrc/xdrposix.c 2022-04-16 00:26:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -262,7 +262,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static bool_t xdrposix_getlong();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static bool_t xdrposix_putlong();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static bool_t xdrposix_getint();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static bool_t xdrposix_putint();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -276,7 +276,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (defined __sun && defined _LP64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static rpc_inline_t * xdrposix_inline();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int32_t * xdrposix_inline();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static netlong * xdrposix_inline();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -302,9 +302,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xdrposix_getpos, /* get offset in the stream */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xdrposix_setpos, /* set offset in the stream */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xdrposix_inline, /* prime stream for inline macros */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xdrposix_destroy, /* destroy stream */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !(defined __x86_64__) && !(defined __powerpc64__) && !(defined __aarch64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NULL, /* no xdr_control function defined */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -560,7 +560,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (defined __sun && defined _LP64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static rpc_inline_t *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int32_t *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static netlong *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -581,7 +581,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static bool_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xdrposix_getint(xdrs, lp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mfhdf/ncgen/ncgen.l.orig 2020-03-03 11:40:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mfhdf/ncgen/ncgen.l 2022-04-16 00:21:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -113,7 +113,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yyerror(errstr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dd < INT_MIN || dd > INT_MAX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dd < LONG_MIN || dd > LONG_MAX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mfhdf/ncgen/ncgenyy.c.orig 2020-03-03 11:40:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mfhdf/ncgen/ncgenyy.c 2022-04-16 00:21:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -991,7 +991,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yyerror(errstr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dd < INT_MIN || dd > INT_MAX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dd < LONG_MIN || dd > LONG_MAX)
</span></pre><pre style='margin:0'>
</pre>