This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a commit to branch master in repository hdf4.
commit e7532733d530ad6d1c5cd1f05216f4f02be61d3a Author: Johan Van de Wauw <johan.vandew...@gmail.com> Date: Mon Aug 18 15:05:50 2014 +0200 Import patches from debian 4.1r4-13 These changes were not in the git repo --- debian/patches/64bit | 2 +- debian/patches/autotools | 16 ++++++++-------- debian/patches/hdfi.h | 11 ++++++++++- debian/patches/shared_fortran | 16 ++++++++-------- 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/debian/patches/64bit b/debian/patches/64bit index b40dd8e..9261fcb 100644 --- a/debian/patches/64bit +++ b/debian/patches/64bit @@ -7,7 +7,7 @@ Index: libhdf4-4.2r3/HDF4/mfhdf/libsrc/netcdf.h.in #if defined _CRAYMPP typedef short nclong; -#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64 -+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64 || defined __ia64__ || defined __x86_64__ || defined __powerpc64__ ++#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64 || defined __ia64__ || defined __x86_64__ || defined __powerpc64__ || (defined __sparc__ && defined __arch64__) || defined __s390x__ + typedef int nclong; #else diff --git a/debian/patches/autotools b/debian/patches/autotools index 03d273c..8697290 100644 --- a/debian/patches/autotools +++ b/debian/patches/autotools @@ -31960,7 +31960,7 @@ Index: libhdf4-4.2r4/HDF4/configure ;; - linux* | k*bsd*-gnu) -+ linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -32161,7 +32161,7 @@ Index: libhdf4-4.2r4/HDF4/configure openbsd*) with_gnu_ld=no ;; -+ linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac @@ -32443,7 +32443,7 @@ Index: libhdf4-4.2r4/HDF4/configure # This must be Linux ELF. -linux* | k*bsd*-gnu) -+linux* | k*bsd*-gnu | kopensolaris*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux need_lib_prefix=no need_version=no @@ -33747,7 +33747,7 @@ Index: libhdf4-4.2r4/HDF4/configure cygwin* | mingw* | cegcc*) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' ;; -+ linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | gnu*) + link_all_deplibs_CXX=no + ;; *) @@ -33827,7 +33827,7 @@ Index: libhdf4-4.2r4/HDF4/configure # This must be Linux ELF. -linux* | k*bsd*-gnu) -+linux* | k*bsd*-gnu | kopensolaris*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux need_lib_prefix=no need_version=no @@ -34194,7 +34194,7 @@ Index: libhdf4-4.2r4/HDF4/configure openbsd*) with_gnu_ld=no ;; -+ linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | gnu*) + link_all_deplibs_F77=no + ;; esac @@ -34461,7 +34461,7 @@ Index: libhdf4-4.2r4/HDF4/configure # This must be Linux ELF. -linux* | k*bsd*-gnu) -+linux* | k*bsd*-gnu | kopensolaris*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux need_lib_prefix=no need_version=no @@ -35121,7 +35121,7 @@ Index: libhdf4-4.2r4/HDF4/configure mips*-sgi-irix5*) BAR="irix5" ;; mips*-sgi-irix4*) BAR="irix4" ;; - *-linux*) BAR="linux" ;; -+ *-linux*|*-k*bsd*-gnu)BAR="linux" ;; ++ *-linux*|*-k*bsd*-gnu | *-gnu*)BAR="linux" ;; *-freebsd*) BAR="fbsd" ;; ia64-*-*) BAR="ia64" ;; *-ibm-aix*) BAR="aix" ;; diff --git a/debian/patches/hdfi.h b/debian/patches/hdfi.h index 5239d8b..9801e4c 100644 --- a/debian/patches/hdfi.h +++ b/debian/patches/hdfi.h @@ -58,7 +58,7 @@ Index: libhdf4-4.2r4/HDF4/hdf/src/hdfi.h #ifndef MIPSEL #define MIPSEL -@@ -1039,6 +1049,349 @@ +@@ -1039,6 +1049,358 @@ #endif /* INTEL86 */ #endif /* !(defined(macintosh) || defined(MAC)) */ @@ -263,14 +263,23 @@ Index: libhdf4-4.2r4/HDF4/hdf/src/hdfi.h +typedef unsigned char uint8; +typedef short int int16; +typedef unsigned short int uint16; ++#ifdef _LP64 /* 64-bit environment */ ++typedef int int32; ++typedef unsigned int uint32; ++#else /* 32-bit environment */ +typedef long int int32; +typedef unsigned long int uint32; ++#endif +typedef int intn; +typedef unsigned int uintn; +typedef float float32; +typedef double float64; +typedef long intf; /* size of INTEGERs in Fortran compiler */ ++#ifdef _LP64 /* 64-bit environment */ ++typedef long hdf_pint_t; /* an integer the same size as a pointer */ ++#else /* 32-bit environment */ +typedef int hdf_pint_t; /* an integer the same size as a pointer */ ++#endif +#define FNAME_POST_UNDERSCORE +#define _fcdtocp(desc) (desc) + diff --git a/debian/patches/shared_fortran b/debian/patches/shared_fortran index ea41011..5fc246a 100644 --- a/debian/patches/shared_fortran +++ b/debian/patches/shared_fortran @@ -31990,7 +31990,7 @@ Index: libhdf4-4.2r4/HDF4/configure ;; - linux* | k*bsd*-gnu) -+ linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -32191,7 +32191,7 @@ Index: libhdf4-4.2r4/HDF4/configure openbsd*) with_gnu_ld=no ;; -+ linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac @@ -32473,7 +32473,7 @@ Index: libhdf4-4.2r4/HDF4/configure # This must be Linux ELF. -linux* | k*bsd*-gnu) -+linux* | k*bsd*-gnu | kopensolaris*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux need_lib_prefix=no need_version=no @@ -33777,7 +33777,7 @@ Index: libhdf4-4.2r4/HDF4/configure cygwin* | mingw* | cegcc*) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' ;; -+ linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | gnu*) + link_all_deplibs_CXX=no + ;; *) @@ -33857,7 +33857,7 @@ Index: libhdf4-4.2r4/HDF4/configure # This must be Linux ELF. -linux* | k*bsd*-gnu) -+linux* | k*bsd*-gnu | kopensolaris*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux need_lib_prefix=no need_version=no @@ -34224,7 +34224,7 @@ Index: libhdf4-4.2r4/HDF4/configure openbsd*) with_gnu_ld=no ;; -+ linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | gnu*) + link_all_deplibs_F77=no + ;; esac @@ -34491,7 +34491,7 @@ Index: libhdf4-4.2r4/HDF4/configure # This must be Linux ELF. -linux* | k*bsd*-gnu) -+linux* | k*bsd*-gnu | kopensolaris*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu| gnu*) version_type=linux need_lib_prefix=no need_version=no @@ -35151,7 +35151,7 @@ Index: libhdf4-4.2r4/HDF4/configure mips*-sgi-irix5*) BAR="irix5" ;; mips*-sgi-irix4*) BAR="irix4" ;; - *-linux*) BAR="linux" ;; -+ *-linux*|*-k*bsd*-gnu)BAR="linux" ;; ++ *-linux*|*-k*bsd*-gnu | *-gnu*)BAR="linux" ;; *-freebsd*) BAR="fbsd" ;; ia64-*-*) BAR="ia64" ;; *-ibm-aix*) BAR="aix" ;; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf4.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel