d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mxe/src/hdf-eos2-1-fixes.patch

138 lines
4.1 KiB
Diff
Raw Normal View History

Copyright headers: point to LICENSE.md and shorten The following script was applied: sed ':a;/part of MXE.$/{N;s/\n//;ba}' -i $(git grep -l 'part of MXE') sed 's/\(part of MXE\).*\(See index.html\)/\1. \2/' -i \ $(git grep -l 'part of MXE.*See index.html') before='This file is part of MXE. See index.html for further information.' after='This file is part of MXE. See LICENSE.md for licensing information.' sed "s/$before/$after/" -i $(git grep -l 'part of MXE') Then git grep 'index.html for further information' revealed two other files. One of them was patched manually (patch.mk). Makefile has text "See index.html for further information" unrelated to licensing. See https://github.com/mxe/mxe/issues/1500#issuecomment-241340792
2016-08-22 20:52:34 +01:00
This file is part of MXE. See LICENSE.md for licensing information.
Add package 'HDF-EOS2'. http://hdfeos.org/software/library.php "The HDF-EOS2 is a software library designed built on HDF4 to support EOS-specific data structures, namely Grid, Point, and Swath. The new data structures are constructed from standard HDF data objects, using EOS conventions, through the use of a software library. A key feature of HDF-EOS files is that instrument-independent services, such as subsetting by geolocation, can be applied to the files across a wide variety of data products."
2016-03-03 16:20:11 +00:00
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <thomas.danckaert@gmail.com>
Date: Thu, 3 Mar 2016 17:13:29 +0100
various packages: run `make refresh-patches` with numbering
2017-11-18 13:44:43 +00:00
Subject: [PATCH 1/1] Remove AC_TRY_RUN to fix cross compiling.
Add package 'HDF-EOS2'. http://hdfeos.org/software/library.php "The HDF-EOS2 is a software library designed built on HDF4 to support EOS-specific data structures, namely Grid, Point, and Swath. The new data structures are constructed from standard HDF data objects, using EOS conventions, through the use of a software library. A key feature of HDF-EOS files is that instrument-independent services, such as subsetting by geolocation, can be applied to the files across a wide variety of data products."
2016-03-03 16:20:11 +00:00
diff --git a/configure.ac b/configure.ac
index 1111111..2222222 100755
--- a/configure.ac
+++ b/configure.ac
@@ -160,17 +160,7 @@ dnl Check if -Df2cFortran is specified
dnl Running only the preprocessor may not be a good idea
dnl because this can be hard-coded.
AC_MSG_CHECKING([for fc2Fortran macro])
-AC_CACHE_VAL([he2_cv_f2cFortran_defined],
- [AC_TRY_RUN([
- int main(void)
- {
- #ifdef f2cFortran
- return 0;
- #else
- return 1;
- #endif
- }
- ], [he2_cv_f2cFortran_defined=yes], [he2_cv_f2cFortran_defined=no],)])
+AC_CACHE_VAL([he2_cv_f2cFortran_defined],[he2_cv_f2cFortran_defined=yes])
if test ${he2_cv_f2cFortran_defined} = "yes"; then
F2CFORTRAN_MACRO="yes"
AC_MSG_RESULT([defined])
@@ -181,18 +171,7 @@ fi
if test ${he2_cv_f2cFortran_defined} = "yes"; then
- AC_CHECK_SIZEOF([int*])
- AC_CACHE_VAL([he2_cv_32ptr],
- [AC_TRY_RUN([
- int main(void)
- {
-#ifdef SIZEOF_INTP
- return SIZEOF_INTP == 4 ? 0 : 1;
-#else
-#error SIZEOF_INTP is not defined
-#endif
- }
- ], [he2_cv_32ptr=yes], [he2_cv_32ptr=no],)])
+ AC_CACHE_VAL([he2_cv_32ptr],[he2_cv_32ptr=no])
if test ${he2_cv_32ptr} = "yes"; then
AC_MSG_NOTICE([possibly 32 bit system])
F2CFORTRAN_32PTR="yes"
@@ -346,32 +325,9 @@ if test "X$HAVE_SZLIB" = "Xyes"; then
AC_MSG_CHECKING([for szlib encoder])
- AC_CACHE_VAL([he2_cv_szlib_functional],
- [AC_TRY_RUN([
- #include <stddef.h>
- #include <szlib.h>
-
- int main(void)
- {
- SZ_encoder_enabled();
- exit(0);
- }
- ], [he2_cv_szlib_functional=yes], [he2_cv_szlib_functional=no],)])
-
- AC_CACHE_VAL([he2_cv_szlib_can_encode],
- [AC_TRY_RUN([
- #include <stddef.h>
- #include <szlib.h>
-
- int main(void)
- {
- /* SZ_encoder_enabled returns 1 if encoder is present */
- if(SZ_encoder_enabled() == 1)
- exit(0);
- else
- exit(1);
- }
- ], [he2_cv_szlib_can_encode=yes], [he2_cv_szlib_can_encode=no],)])
+ AC_CACHE_VAL([he2_cv_szlib_functional],[he2_cv_szlib_functional=no])
+
+ AC_CACHE_VAL([he2_cv_szlib_can_encode],[he2_cv_szlib_can_encode=no])
CC="$saved_CC"
rm -f $SZIP_CC
@@ -477,22 +433,7 @@ if test "x$HAVE_HDF4" = "xyes"; then
dnl Check if HDF4 is linked with SZIP encoder
AC_MSG_CHECKING([for hdf4 szip decoding filter])
- AC_CACHE_VAL([he2_cv_hdf4_szip_can_decode],
- [AC_TRY_RUN([
- #include <hdf.h>
-
- int main(void)
- {
- comp_coder_t codertype = COMP_CODE_SZIP;
- uint32 configinfo;
- int decoder = 0;
-
- HCget_config_info(codertype, &configinfo);
- decoder = configinfo & COMP_DECODER_ENABLED;
- if (decoder) exit(0);
- else exit(1);
- }
- ], [he2_cv_hdf4_szip_can_decode=yes], [he2_cv_hdf4_szip_can_decode=no],)])
+ AC_CACHE_VAL([he2_cv_hdf4_szip_can_decode],[he2_cv_hdf4_szip_can_decode=no])
if test ${he2_cv_hdf4_szip_can_decode} = "yes"; then
AC_DEFINE(HAVE_HDF4_SZIP_DECODER, 1,
[Define if HDF4 has szip decoder filter])
@@ -502,22 +443,7 @@ if test "x$HAVE_HDF4" = "xyes"; then
fi
AC_MSG_CHECKING([for hdf4 szip encoding filter])
- AC_CACHE_VAL([he2_cv_hdf4_szip_can_encode],
- [AC_TRY_RUN([
- #include <hdf.h>
-
- int main(void)
- {
- comp_coder_t codertype = COMP_CODE_SZIP;
- uint32 configinfo;
- int encoder = 0;
-
- HCget_config_info(codertype, &configinfo);
- encoder = configinfo & COMP_ENCODER_ENABLED;
- if (encoder) exit(0);
- else exit(1);
- }
- ], [he2_cv_hdf4_szip_can_encode=yes], [he2_cv_hdf4_szip_can_encode=no],)])
+ AC_CACHE_VAL([he2_cv_hdf4_szip_can_encode],[he2_cv_hdf4_szip_can_encode=no])
if test ${he2_cv_hdf4_szip_can_encode} = "yes"; then
AC_DEFINE(HAVE_HDF4_SZIP_ENCODER, 1,