diff --git a/.cvsignore b/.cvsignore index 5c53de5..ca5351f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -hdf5-1.8.1.tar.gz +hdf5-1.8.2.tar.gz diff --git a/h5comp b/h5comp index f7b7cb8..4782d00 100644 --- a/h5comp +++ b/h5comp @@ -7,4 +7,4 @@ case $ARCH in * ) BITS=32;; esac -exec $0-${BITS} +exec $0-${BITS} "$@" diff --git a/hdf5-1.8.0-destdir.patch b/hdf5-1.8.0-destdir.patch deleted file mode 100644 index 0765218..0000000 --- a/hdf5-1.8.0-destdir.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- hdf5-1.8.0/tools/misc/Makefile.in.destdir 2008-02-12 19:38:48.000000000 -0700 -+++ hdf5-1.8.0/tools/misc/Makefile.in 2008-02-28 14:19:35.000000000 -0700 -@@ -731,9 +731,9 @@ - @$(top_srcdir)/bin/makehelp - - install-exec-local: -- @$(INSTALL) h5cc $(bindir)/$(H5CC_NAME) -+ @$(INSTALL) h5cc $(DESTDIR)$(bindir)/$(H5CC_NAME) - uninstall-local: -- @$(RM) $(bindir)/$(H5CC_NAME) -+ @$(RM) $(DESTDIR)$(bindir)/$(H5CC_NAME) - - # How to build h5redeploy script - h5redeploy: h5redeploy.in ---- hdf5-1.8.0/fortran/src/Makefile.in.destdir 2008-02-12 19:39:01.000000000 -0700 -+++ hdf5-1.8.0/fortran/src/Makefile.in 2008-02-28 15:02:08.000000000 -0700 -@@ -821,20 +821,20 @@ - - install-data-local: - @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ -- $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \ -+ $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(DESTDIR)$(includedir)/. ; \ - fi - - uninstall-local: - @if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \ -- if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \ -- set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \ -+ if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(DESTDIR)$(includedir)/HDF5.$(F9XMODEXT)"; then \ -+ set -x; $(RM) $(DESTDIR)$(includedir)/*.$(F9XMODEXT); \ - fi; \ - fi; \ -- $(RM) $(bindir)/$(H5FC_NAME) -+ $(RM) $(DESTDIR)$(bindir)/$(H5FC_NAME) - - # Also install and uninstall (uninstall-local above) h5fc script - install-exec-local: -- @$(INSTALL) h5fc $(bindir)/$(H5FC_NAME) -+ @$(INSTALL) h5fc $(DESTDIR)$(bindir)/$(H5FC_NAME) - - #Specify what Automake needs to create: first the H5fort_type_defines.h - # header, then H5match_types which includes that header, then ---- hdf5-1.8.0/hl/fortran/src/Makefile.in.destdir 2008-02-12 19:38:56.000000000 -0700 -+++ hdf5-1.8.0/hl/fortran/src/Makefile.in 2008-02-28 15:26:42.000000000 -0700 -@@ -681,13 +681,13 @@ - - install-data-local: - @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ -- $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \ -+ $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(DESTDIR)$(includedir)/. ; \ - fi - - uninstall-local: - @if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \ -- if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \ -- set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \ -+ if test -f "$(DESTDIR)$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(DESTDIR)$(includedir)/HDF5.$(F9XMODEXT)"; then \ -+ set -x; $(RM) $(DESTDIR)$(includedir)/*.$(F9XMODEXT); \ - fi; \ - fi - diff --git a/hdf5-1.8.0-scaleoffset.patch b/hdf5-1.8.0-scaleoffset.patch deleted file mode 100644 index 64310c3..0000000 --- a/hdf5-1.8.0-scaleoffset.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- hdf5-1.8.0-snap5/test/dsets.c.scaleoffset 2008-05-01 18:27:56.000000000 -0600 -+++ hdf5-1.8.0-snap5/test/dsets.c 2008-05-05 14:47:15.000000000 -0600 -@@ -6458,10 +6458,11 @@ - nerrors += (test_nbit_compound_3(file) < 0 ? 1 : 0); - nerrors += (test_scaleoffset_int(file) < 0 ? 1 : 0); - nerrors += (test_scaleoffset_int_2(file) < 0 ? 1 : 0); -+ /* fails - nerrors += (test_scaleoffset_float(file) < 0 ? 1 : 0); - nerrors += (test_scaleoffset_float_2(file) < 0 ? 1 : 0); - nerrors += (test_scaleoffset_double(file) < 0 ? 1 : 0); -- nerrors += (test_scaleoffset_double_2(file) < 0 ? 1 : 0); -+ nerrors += (test_scaleoffset_double_2(file) < 0 ? 1 : 0); */ - nerrors += (test_multiopen (file) < 0 ? 1 : 0); - nerrors += (test_types(file) < 0 ? 1 : 0); - nerrors += (test_userblock_offset(my_fapl) < 0 ? 1 : 0); diff --git a/hdf5-1.8.2-detect.patch b/hdf5-1.8.2-detect.patch new file mode 100644 index 0000000..5bb90f0 --- /dev/null +++ b/hdf5-1.8.2-detect.patch @@ -0,0 +1,43 @@ +--- hdf5-1.8.2/src/Makefile.in.detect 2008-11-10 14:40:45.000000000 -0700 ++++ hdf5-1.8.2/src/Makefile.in 2009-02-23 13:26:39.000000000 -0700 +@@ -132,7 +132,7 @@ + H5detect_OBJECTS = H5detect-H5detect.$(OBJEXT) + H5detect_LDADD = $(LDADD) + H5detect_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(H5detect_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ --mode=link $(CCLD) $(CFLAGS) $(H5detect_CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/bin/depcomp +@@ -408,7 +408,7 @@ + LT_VERS_INTERFACE = 6 + LT_VERS_REVISION = 1 + LT_VERS_AGE = 0 +-H5detect_CFLAGS = -g ++H5detect_CFLAGS = -g -O0 + + # Our main target, the HDF5 library + lib_LTLIBRARIES = libhdf5.la +@@ -860,18 +860,18 @@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + H5detect-H5detect.o: H5detect.c +-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(H5detect_CFLAGS) $(CFLAGS) -MT H5detect-H5detect.o -MD -MP -MF $(DEPDIR)/H5detect-H5detect.Tpo -c -o H5detect-H5detect.o `test -f 'H5detect.c' || echo '$(srcdir)/'`H5detect.c ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(H5detect_CFLAGS) -MT H5detect-H5detect.o -MD -MP -MF $(DEPDIR)/H5detect-H5detect.Tpo -c -o H5detect-H5detect.o `test -f 'H5detect.c' || echo '$(srcdir)/'`H5detect.c + @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/H5detect-H5detect.Tpo $(DEPDIR)/H5detect-H5detect.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='H5detect.c' object='H5detect-H5detect.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(H5detect_CFLAGS) $(CFLAGS) -c -o H5detect-H5detect.o `test -f 'H5detect.c' || echo '$(srcdir)/'`H5detect.c ++@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(H5detect_CFLAGS) -c -o H5detect-H5detect.o `test -f 'H5detect.c' || echo '$(srcdir)/'`H5detect.c + + H5detect-H5detect.obj: H5detect.c +-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(H5detect_CFLAGS) $(CFLAGS) -MT H5detect-H5detect.obj -MD -MP -MF $(DEPDIR)/H5detect-H5detect.Tpo -c -o H5detect-H5detect.obj `if test -f 'H5detect.c'; then $(CYGPATH_W) 'H5detect.c'; else $(CYGPATH_W) '$(srcdir)/H5detect.c'; fi` ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(H5detect_CFLAGS) -MT H5detect-H5detect.obj -MD -MP -MF $(DEPDIR)/H5detect-H5detect.Tpo -c -o H5detect-H5detect.obj `if test -f 'H5detect.c'; then $(CYGPATH_W) 'H5detect.c'; else $(CYGPATH_W) '$(srcdir)/H5detect.c'; fi` + @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/H5detect-H5detect.Tpo $(DEPDIR)/H5detect-H5detect.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='H5detect.c' object='H5detect-H5detect.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(H5detect_CFLAGS) $(CFLAGS) -c -o H5detect-H5detect.obj `if test -f 'H5detect.c'; then $(CYGPATH_W) 'H5detect.c'; else $(CYGPATH_W) '$(srcdir)/H5detect.c'; fi` ++@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(H5detect_CFLAGS) -c -o H5detect-H5detect.obj `if test -f 'H5detect.c'; then $(CYGPATH_W) 'H5detect.c'; else $(CYGPATH_W) '$(srcdir)/H5detect.c'; fi` + + mostlyclean-libtool: + -rm -f *.lo diff --git a/hdf5-1.8.0-signal.patch b/hdf5-1.8.2-signal.patch similarity index 78% rename from hdf5-1.8.0-signal.patch rename to hdf5-1.8.2-signal.patch index 90ef350..a562463 100644 --- a/hdf5-1.8.0-signal.patch +++ b/hdf5-1.8.2-signal.patch @@ -1,5 +1,5 @@ ---- hdf5-1.8.0/src/H5detect.c.signal 2008-02-12 19:38:32.000000000 -0700 -+++ hdf5-1.8.0/src/H5detect.c 2008-02-27 20:35:03.000000000 -0700 +--- hdf5-1.8.2/src/H5detect.c.signal 2008-11-10 14:28:08.000000000 -0700 ++++ hdf5-1.8.2/src/H5detect.c 2008-11-14 15:10:51.000000000 -0700 @@ -109,7 +109,7 @@ static void detect_C99_integers64(void); static void detect_alignments(void); @@ -9,16 +9,16 @@ /*------------------------------------------------------------------------- -@@ -366,7 +366,7 @@ +@@ -368,7 +368,7 @@ void (*_handler2)(int) = signal(SIGSEGV, sigsegv_handler); \ \ - _buf = (char*)malloc(sizeof(TYPE)+align_g[NELMTS(align_g)-1]); \ -- if (setjmp(jbuf_g)) _ano++; \ -+ if (sigsetjmp(jbuf_g, 1)) _ano++; \ - if (_ano 1.8.2-1 +- Update to 1.8.2 +- Add patch to compile H5detect without optimization - make detection + of datatype characteristics more robust - esp. long double +- Update signal patch +- Drop destdir patch fixed upstream +- Drop scaleoffset patch +- Re-add -fno-strict-aliasing +- Keep settings file needed for -showconfig (bug #481032) +- Wrapper script needs to pass arguments (bug #481032) + * Wed Oct 8 2008 Orion Poplawski 1.8.1-3 - Add sparc64 to 64-bit conditionals diff --git a/sources b/sources index d3e6498..a131974 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -193a4ea1a2b1c6d34bcb357db7d112a6 hdf5-1.8.1.tar.gz +af92ef65ef495dbd205131574ad4eee1 hdf5-1.8.2.tar.gz