diff options
author | Michael Mair-Keimberger <m.mairkeimberger@gmail.com> | 2019-11-20 19:33:17 +0100 |
---|---|---|
committer | Aaron Bauman <bman@gentoo.org> | 2019-11-23 19:40:44 -0500 |
commit | 9944e026169ff995416c0c8305ea6f5148bf7c5c (patch) | |
tree | 7ccbfb3339687779eb1f46d8319fc520dd88cf2d /sci-libs/hdf | |
parent | dev-libs/libtecla: remove unused patches (diff) | |
download | gentoo-9944e026169ff995416c0c8305ea6f5148bf7c5c.tar.gz gentoo-9944e026169ff995416c0c8305ea6f5148bf7c5c.tar.bz2 gentoo-9944e026169ff995416c0c8305ea6f5148bf7c5c.zip |
sci-libs/hdf: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13722
Signed-off-by: Aaron Bauman <bman@gentoo.org>
Diffstat (limited to 'sci-libs/hdf')
-rw-r--r-- | sci-libs/hdf/files/4.2.7_p1-autotools.patch | 116 | ||||
-rw-r--r-- | sci-libs/hdf/files/hdf-4.2.9-autotools.patch | 112 | ||||
-rw-r--r-- | sci-libs/hdf/files/hdf-ppc.patch | 214 |
3 files changed, 0 insertions, 442 deletions
diff --git a/sci-libs/hdf/files/4.2.7_p1-autotools.patch b/sci-libs/hdf/files/4.2.7_p1-autotools.patch deleted file mode 100644 index 6ae9ccfc64e5..000000000000 --- a/sci-libs/hdf/files/4.2.7_p1-autotools.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff -Nur hdf-4.2.7-patch1.orig/configure.ac hdf-4.2.7-patch1/configure.ac ---- hdf-4.2.7-patch1.orig/configure.ac 2012-03-18 03:45:46.000000000 +0000 -+++ hdf-4.2.7-patch1/configure.ac 2012-04-13 03:04:17.000000000 +0100 -@@ -200,20 +200,6 @@ - dnl Build static libraries by default. Furthermore, fortran shared libraries - dnl are unsupported. Disallow a user from enabling both shared libraries and - dnl fortran. --if test "X${enable_shared}" != "Xyes"; then -- enable_shared="no" --fi -- --if test "X${enable_shared}" = "Xyes"; then -- if test "X${BUILD_FORTRAN}" = "Xyes"; then -- AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure with --disable-fortran flag.]) -- fi --fi -- --AC_PROG_INSTALL --AC_PROG_LN_S -- --AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH]) - - AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [none], []) - -@@ -404,6 +390,8 @@ - - if test -z "$HAVE_SZIP"; then - AC_MSG_ERROR([couldn't find szlib library]) -+ else -+ USE_COMP_SZIP="yes" - fi - ;; - no) -@@ -447,7 +435,7 @@ - - AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP]) - -- if test -z "$HAVE_SZIP"; then -+ if test "X$HAVE_SZIP" != "Xyes"; then - AC_MSG_ERROR([couldn't find szlib library]) - else - USE_COMP_SZIP="yes" -@@ -703,7 +691,7 @@ - dnl ====================================================================== - dnl Libtool initialization - dnl ====================================================================== --LT_INIT(dlopen disable-shared) -+LT_INIT(dlopen) - LT_OUTPUT - - dnl ====================================================================== -@@ -781,11 +769,6 @@ - dnl ------------------------------------------------------------------------ - dnl Check to see if libtool has enabled shared libraries. Set a conditional - dnl as some Makefiles will build based on availability of shared libraries. --if (./libtool --features | grep '^enable shared libraries' > /dev/null); then -- enable_shared=yes --else -- enable_shared=no --fi - - dnl ------------------------------------------------------------------------ - dnl Specify shared library extension the host machine should recognize. -@@ -840,23 +823,8 @@ - dnl name of the compiler and the reported version number. - AC_SUBST([F77_VERSION]) - dnl Strip anything that looks like a flag off of $F77 --F77_NOFLAGS=`echo $F77 | sed 's/ -.*//'` -- --if `echo $F77_NOFLAGS | grep ^/ >/dev/null 2>&1`; then -- F77_VERSION="$F77" --else -- F77_VERSION="$F77"; -- for x in `echo $PATH | sed -e 's/:/ /g'`; do -- if test -x $x/$F77_NOFLAGS; then -- F77_VERSION="$x/$F77" -- break -- fi -- done --fi --if test -n "$fc_version_info"; then -- F77_VERSION="$F77_VERSION ( $fc_version_info)" --fi - -+F77_VERSION="$F77"; - - dnl This part doesn't work yet since HDF4 config files do not contain - dnl information for fortran_vendor and fortran_version. -diff -Nur hdf-4.2.7-patch1.orig/hdf/test/fortestF.f hdf-4.2.7-patch1/hdf/test/fortestF.f ---- hdf-4.2.7-patch1.orig/hdf/test/fortestF.f 2012-03-18 03:44:01.000000000 +0000 -+++ hdf-4.2.7-patch1/hdf/test/fortestF.f 2012-04-13 02:20:45.000000000 +0100 -@@ -203,7 +203,7 @@ - - if (cmd .NE. 'Test' .AND. cmd .NE. 'test') then - print *, 'Unknown Command: ', cmd, param -- print *, 'Try one of "Skip", "Test", "Verbosity" or "Cleanup"' -+ print *, 'Try one of Skip, Test, Verbosity or Cleanup' - retcode = -1 - return - endif -diff -Nur hdf-4.2.7-patch1.orig/mfhdf/libsrc/Makefile.am hdf-4.2.7-patch1/mfhdf/libsrc/Makefile.am ---- hdf-4.2.7-patch1.orig/mfhdf/libsrc/Makefile.am 2012-03-18 03:44:00.000000000 +0000 -+++ hdf-4.2.7-patch1/mfhdf/libsrc/Makefile.am 2012-04-13 02:20:45.000000000 +0100 -@@ -32,10 +32,11 @@ - else - libmfhdf_la_SOURCES = $(CSOURCES) - endif -+libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.la - - if HDF_BUILD_XDR - XDRLIB = ../xdr/libxdr.la --libmfhdf_la_LIBADD = $(XDRLIB) -+libmfhdf_la_LIBADD += $(XDRLIB) - endif - - if HDF_BUILD_NETCDF diff --git a/sci-libs/hdf/files/hdf-4.2.9-autotools.patch b/sci-libs/hdf/files/hdf-4.2.9-autotools.patch deleted file mode 100644 index a31946a0dfee..000000000000 --- a/sci-libs/hdf/files/hdf-4.2.9-autotools.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -216,20 +216,6 @@ AC_SUBST([BUILD_FORTRAN]) - ## Build static libraries by default. Furthermore, fortran shared libraries - ## are unsupported. Disallow a user from enabling both shared libraries and - ## fortran. --if test "X${enable_shared}" != "Xyes"; then -- enable_shared="no" --fi -- --if test "X${enable_shared}" = "Xyes"; then -- if test "X${BUILD_FORTRAN}" = "Xyes"; then -- AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure with --disable-fortran flag.]) -- fi --fi -- --AC_PROG_INSTALL --AC_PROG_LN_S -- --AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH]) - - AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [none], []) - -@@ -261,7 +247,7 @@ AC_SUBST([LT_STATIC_EXEC]) - ## ====================================================================== - ## Libtool initialization - ## ====================================================================== --LT_INIT([dlopen disable-shared]) -+LT_INIT([dlopen]) - LT_OUTPUT - - ## ---------------------------------------------------------------------- -@@ -453,6 +439,8 @@ case "$withval" in - - if test -z "$HAVE_SZIP"; then - AC_MSG_ERROR([couldn't find szlib library]) -+ else -+ USE_COMP_SZIP="yes" - fi - ;; - no) -@@ -496,7 +484,7 @@ case "$withval" in - - AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP]) - -- if test -z "$HAVE_SZIP"; then -+ if test "X$HAVE_SZIP" != "Xyes"; then - AC_MSG_ERROR([couldn't find szlib library]) - else - USE_COMP_SZIP="yes" -@@ -837,11 +825,6 @@ done - ## ------------------------------------------------------------------------ - ## Check to see if libtool has enabled shared libraries. Set a conditional - ## as some Makefiles will build based on availability of shared libraries. --if (./libtool --features | grep '^enable shared libraries' > /dev/null); then -- enable_shared=yes --else -- enable_shared=no --fi - - ## ------------------------------------------------------------------------ - ## Specify shared library extension the host machine should recognize. -@@ -911,22 +894,7 @@ fi - ## name of the compiler and the reported version number. - AC_SUBST([F77_VERSION]) - ## Strip anything that looks like a flag off of $F77 --F77_NOFLAGS=`echo $F77 | sed 's/ -.*//'` -- --if `echo $F77_NOFLAGS | grep ^/ >/dev/null 2>&1`; then -- F77_VERSION="$F77" --else -- F77_VERSION="$F77"; -- for x in `echo $PATH | sed -e 's/:/ /g'`; do -- if test -x $x/$F77_NOFLAGS; then -- F77_VERSION="$x/$F77" -- break -- fi -- done --fi --if test -n "$fc_version_info"; then -- F77_VERSION="$F77_VERSION ( $fc_version_info)" --fi -+F77_VERSION="$F77" - - ## This part doesn't work yet since HDF4 config files do not contain - ## information for fortran_vendor and fortran_version. ---- a/hdf/test/fortestF.f -+++ b/hdf/test/fortestF.f -@@ -203,7 +203,7 @@ C Skip command - - if (cmd .NE. 'Test' .AND. cmd .NE. 'test') then - print *, 'Unknown Command: ', cmd, param -- print *, 'Try one of "Skip", "Test", "Verbosity" or "Cleanup"' -+ print *, 'Try one of Skip, Test, Verbosity or Cleanup' - retcode = -1 - return - endif ---- a/mfhdf/libsrc/Makefile.am -+++ b/mfhdf/libsrc/Makefile.am -@@ -32,10 +32,11 @@ libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES) - else - libmfhdf_la_SOURCES = $(CSOURCES) - endif -+libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.la - - if HDF_BUILD_XDR - XDRLIB = $(top_builddir)/mfhdf/xdr/libxdr.la --libmfhdf_la_LIBADD = $(XDRLIB) -+libmfhdf_la_LIBADD += $(XDRLIB) - endif - - if HDF_BUILD_NETCDF diff --git a/sci-libs/hdf/files/hdf-ppc.patch b/sci-libs/hdf/files/hdf-ppc.patch deleted file mode 100644 index 3cf62d09371d..000000000000 --- a/sci-libs/hdf/files/hdf-ppc.patch +++ /dev/null @@ -1,214 +0,0 @@ -Fix FTBS on ppc - -https://bugs.gentoo.org/show_bug.cgi?id=450188 - -Source: http://pkgs.fedoraproject.org/cgit/hdf.git ---- a/hdf/src/hdfi.h -+++ b/hdf/src/hdfi.h -@@ -76,6 +76,7 @@ - #define DFMT_IA64 0x4441 - #define DFMT_LINUX64 0x4441 - #define DFMT_POWERPC64 0x1111 -+#define DFMT_LINUXPPC 0x1111 - - /* I/O library constants */ - #define UNIXUNBUFIO 1 -@@ -1289,6 +1290,57 @@ typedef long hdf_pint_t; - - #endif /*Linux 64 */ - -+/* Linux PPC */ -+#if defined __powerpc__ && !defined __powerpc64__ -+ -+#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 -+ -+#include <sys/file.h> /* for unbuffered i/o stuff */ -+#include <sys/stat.h> -+#define DF_MT DFMT_LINUXPPC -+typedef void VOID; -+typedef void *VOIDP; -+typedef char *_fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef 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 int intf; /* size of INTEGERs in Fortran compiler */ -+typedef float float32; -+typedef double float64; -+typedef long hdf_pint_t; /* an integer the same size as a pointer */ -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+#ifdef HAVE_FMPOOL -+#define FILELIB PAGEBUFIO /* enable page buffering */ -+#else -+#define FILELIB UNIXBUFIO -+#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 -+ -+#ifdef __GNUC__ -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+#endif -+ -+#endif /*Linux PPC */ -+ - /*-----------------------------------------------------*/ - /* 64-bit Free BSD */ - ---- a/mfhdf/fortran/config/jackets-linux.c -+++ b/mfhdf/fortran/config/jackets-linux.c -@@ -34,7 +34,7 @@ - - struct ncfils { /* This will be a common block from Fortran */ - double dd; --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - int ll; - #else - long ll; -@@ -65,7 +65,7 @@ struct ncfils { /* This will be a comm - - struct ncfils { /* This will be a common block from Fortran */ - double dd; --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - int ll; - #else - long ll; -@@ -430,7 +430,7 @@ stoig(shorts, ints, dims, basis, ndims) - } - #endif /* FORTRAN_HAS_NO_SHORT */ - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - /* - * Convert multi-dimensional array of NCLONGs stored in ints to packed - * array of longs, in malloc'ed space. Returns pointer to longs or NULL -@@ -916,7 +916,7 @@ nncvpt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs = *(int *)value; -@@ -1030,7 +1030,7 @@ nncvpt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, ncount, ndims); -@@ -1141,7 +1141,7 @@ nncvptg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); - else - #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - if (datatype == NC_LONG) - tmpbasis = sizeof(int); - else -@@ -1198,7 +1198,7 @@ nncvptg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itolg (value, ncount, nbasis, ndims); -@@ -1334,7 +1334,7 @@ nncvgt1(cdfid, varid, indices, value, rc - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long longs; -@@ -1476,7 +1476,7 @@ nncvgt(cdfid, varid, start, count, value - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1614,7 +1614,7 @@ nncvgtg(cdfid, varid, start, count, stri - tmpbasis = nctypelen(NC_LONG); - else - #endif --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - if (datatype == NC_LONG) - tmpbasis = sizeof(int); - else -@@ -1685,7 +1685,7 @@ nncvgtg(cdfid, varid, start, count, stri - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1851,7 +1851,7 @@ nncapt(cdfid, varid, attname, datatype, - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { - long *longs = itol (value, attlen, 1); -@@ -2016,7 +2016,7 @@ nncagt(cdfid, varid, attname, value, rco - return; - } /* else */ - #endif /* FORTRAN_HAS_NO_SHORT */ --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - #ifdef HDF - if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { - /* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes ---- a/mfhdf/libsrc/netcdf.h.in -+++ b/mfhdf/libsrc/netcdf.h.in -@@ -295,7 +295,7 @@ typedef double ncdouble; - */ - #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 __powerpc64__ - typedef int nclong; - #else - typedef long nclong; /* default, compatible type */ ---- a/mfhdf/ncgen/ncgen.l -+++ b/mfhdf/ncgen/ncgen.l -@@ -134,7 +134,7 @@ FloatInf|Infinity|Inf { /* float miss - yyerror(errstr); - } - --#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ -+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - if (dd < INT_MIN || dd > INT_MAX) - #else - #if defined (_CRAYMPP) |