rpms/hdf5/devel hdf5-1.8.2-detect.patch, NONE, 1.1 hdf5-1.8.2-signal.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 h5comp, 1.1, 1.2 hdf5.spec, 1.34, 1.35 sources, 1.10, 1.11 hdf5-1.8.0-destdir.patch, 1.1, NONE hdf5-1.8.0-scaleoffset.patch, 1.2, NONE hdf5-1.8.0-signal.patch, 1.1, NONE
Orion Poplawski
orion at fedoraproject.org
Mon Feb 23 23:09:19 UTC 2009
Author: orion
Update of /cvs/pkgs/rpms/hdf5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11401
Modified Files:
.cvsignore h5comp hdf5.spec sources
Added Files:
hdf5-1.8.2-detect.patch hdf5-1.8.2-signal.patch
Removed Files:
hdf5-1.8.0-destdir.patch hdf5-1.8.0-scaleoffset.patch
hdf5-1.8.0-signal.patch
Log Message:
* Mon Feb 23 2009 Orion Poplawski <orion at cora.nwra.com> 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)
hdf5-1.8.2-detect.patch:
--- NEW FILE hdf5-1.8.2-detect.patch ---
--- 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. at 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
- at 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
+ at 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@
- at 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
+ at 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
- at 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`
+ at 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@
- at 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`
+ at 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
hdf5-1.8.2-signal.patch:
--- NEW FILE hdf5-1.8.2-signal.patch ---
--- 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);
static size_t align_g[] = {1, 2, 4, 8, 16};
-static jmp_buf jbuf_g;
+static sigjmp_buf jbuf_g;
/*-------------------------------------------------------------------------
@@ -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 < NELMTS(align_g)) { \
*((TYPE*)(_buf+align_g[_ano])) = _val; /*possible SIGBUS or SEGSEGV*/ \
_val2 = *((TYPE*)(_buf+align_g[_ano])); /*possible SIGBUS or SEGSEGV*/ \
@@ -385,7 +385,7 @@
memcpy(_buf+align_g[_ano]+(INFO.offset/8),((char *)&_val)+(INFO.offset/8),(size_t)(INFO.precision/8)); \
_val2 = *((TYPE*)(_buf+align_g[_ano])); \
if(_val!=_val2) \
- longjmp(jbuf_g, 1); \
+ siglongjmp(jbuf_g, 1); \
/* End Cray Check */ \
(INFO.align)=align_g[_ano]; \
} else { \
@@ -456,7 +456,7 @@
* it's not nearly as nice to work with, it does the job for
* this simple stuff.
*
- * Return: Returns via longjmp to jbuf_g.
+ * Return: Returns via siglongjmp to jbuf_g.
*
* Programmer: Robb Matzke
* Thursday, March 18, 1999
@@ -469,7 +469,7 @@
sigsegv_handler(int UNUSED signo)
{
signal(SIGSEGV, sigsegv_handler);
- longjmp(jbuf_g, 1);
+ siglongjmp(jbuf_g, 1);
}
@@ -481,7 +481,7 @@
* it's not nearly as nice to work with, it does the job for
* this simple stuff.
*
- * Return: Returns via longjmp to jbuf_g.
+ * Return: Returns via siglongjmp to jbuf_g.
*
* Programmer: Robb Matzke
* Thursday, March 18, 1999
@@ -494,7 +494,7 @@
sigbus_handler(int UNUSED signo)
{
signal(SIGBUS, sigbus_handler);
- longjmp(jbuf_g, 1);
+ siglongjmp(jbuf_g, 1);
#ifdef H5_HAVE_SIGLONGJMP
siglongjmp(jbuf_g, 1);
#endif /* H5_HAVE_SIGLONGJMP */
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 5 Jun 2008 21:05:53 -0000 1.10
+++ .cvsignore 23 Feb 2009 23:08:49 -0000 1.11
@@ -1 +1 @@
-hdf5-1.8.1.tar.gz
+hdf5-1.8.2.tar.gz
Index: h5comp
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/devel/h5comp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- h5comp 29 Feb 2008 22:49:06 -0000 1.1
+++ h5comp 23 Feb 2009 23:08:49 -0000 1.2
@@ -7,4 +7,4 @@
* ) BITS=32;;
esac
-exec $0-${BITS}
+exec $0-${BITS} "$@"
Index: hdf5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/devel/hdf5.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- hdf5.spec 23 Feb 2009 16:13:27 -0000 1.34
+++ hdf5.spec 23 Feb 2009 23:08:49 -0000 1.35
@@ -1,6 +1,6 @@
Name: hdf5
-Version: 1.8.1
-Release: 3%{?dist}
+Version: 1.8.2
+Release: 1%{?dist}
Summary: A general purpose library and file format for storing scientific data
License: BSD
Group: System Environment/Libraries
@@ -8,10 +8,9 @@
Source0: ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.gz
#Source0: ftp://ftp.hdfgroup.uiuc.edu/pub/outgoing/hdf5/snapshots/v18/hdf5-1.8.1-rc1.tar.gz
Source1: h5comp
-Patch1: hdf5-1.8.0-signal.patch
-Patch2: hdf5-1.8.0-destdir.patch
+Patch1: hdf5-1.8.2-signal.patch
+Patch2: hdf5-1.8.2-detect.patch
Patch3: hdf5-1.8.0-multiarch.patch
-Patch4: hdf5-1.8.0-scaleoffset.patch
Patch5: hdf5-1.8.0-longdouble.patch
Patch6: hdf5-1.8.1-filter-as-option.patch
Patch10: hdf5-1.6.5-open.patch
@@ -49,9 +48,8 @@
%prep
%setup -q
%patch1 -p1 -b .signal
-%patch2 -p1 -b .destdir
+%patch2 -p1 -b .detect
%patch3 -p1 -b .multiarch
-%patch4 -p1 -b .scaleoffset
%ifarch ppc64
%patch5 -p1 -b .longdouble
%endif
@@ -63,6 +61,7 @@
export CC=gcc
export CXX=g++
export F9X=gfortran
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
# Must turn of production mode to preserve -g during compile
%configure --enable-production=no --enable-debug=no \
--enable-cxx --enable-fortran \
@@ -81,7 +80,7 @@
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=${RPM_BUILD_ROOT}
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
#Fortran modules
mkdir -p ${RPM_BUILD_ROOT}%{_fmoddir}
mv ${RPM_BUILD_ROOT}%{_includedir}/*.mod ${RPM_BUILD_ROOT}%{_fmoddir}
@@ -135,7 +134,6 @@
%{_bindir}/h5jam
%{_bindir}/h5ls
%{_bindir}/h5mkgrp
-%{_bindir}/h5perf
%{_bindir}/h5perf_serial
%{_bindir}/h5repack
%{_bindir}/h5repart
@@ -154,6 +152,7 @@
%{_bindir}/h5redeploy
%{_includedir}/*.h
%{_libdir}/*.so
+%{_libdir}/*.settings
%{_fmoddir}/*.mod
%files static
@@ -162,6 +161,17 @@
%changelog
+* Mon Feb 23 2009 Orion Poplawski <orion at cora.nwra.com> 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 <orion at cora.nwra.com> 1.8.1-3
- Add sparc64 to 64-bit conditionals
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 5 Jun 2008 21:05:53 -0000 1.10
+++ sources 23 Feb 2009 23:08:49 -0000 1.11
@@ -1 +1 @@
-193a4ea1a2b1c6d34bcb357db7d112a6 hdf5-1.8.1.tar.gz
+af92ef65ef495dbd205131574ad4eee1 hdf5-1.8.2.tar.gz
--- hdf5-1.8.0-destdir.patch DELETED ---
--- hdf5-1.8.0-scaleoffset.patch DELETED ---
--- hdf5-1.8.0-signal.patch DELETED ---
More information about the fedora-extras-commits
mailing list