- Update to 1.8.4
- Must compile with -O0 due to gcc-4.4 incompatability - No longer need -fno-strict-aliasing
This commit is contained in:
parent
4456c63ded
commit
89f5acb695
@ -1 +1 @@
|
||||
hdf5-1.8.3-snap12.tar.gz
|
||||
hdf5-1.8.4.tar.bz2
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- hdf5-1.8.3-snap12/hl/fortran/test/Makefile.in.tstlite 2009-09-21 16:41:49.000000000 -0600
|
||||
+++ hdf5-1.8.3-snap12/hl/fortran/test/Makefile.in 2009-10-01 14:05:01.628777355 -0600
|
||||
@@ -355,7 +355,7 @@
|
||||
@FORTRAN_SHARED_CONDITIONAL_FALSE@AM_LDFLAGS = -static
|
||||
|
||||
# Our main target, the test programs
|
||||
-TEST_PROG = tstlite tstimage tsttable
|
||||
+TEST_PROG = tstimage tsttable
|
||||
LDADD = $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL) $(LIBHDF5)
|
||||
|
||||
# Source files for the programs
|
11
hdf5-1.8.4-tstlite.patch
Normal file
11
hdf5-1.8.4-tstlite.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- hdf5-1.8.4/hl/fortran/test/Makefile.in.tstlite 2009-11-10 14:12:08.000000000 -0700
|
||||
+++ hdf5-1.8.4/hl/fortran/test/Makefile.in 2010-01-06 10:59:07.916197584 -0700
|
||||
@@ -364,7 +364,7 @@
|
||||
f1tab.h5
|
||||
|
||||
# Our main target, the test programs
|
||||
-TEST_PROG = tstlite tstimage tsttable
|
||||
+TEST_PROG = tstimage tsttable
|
||||
LDADD = $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL) $(LIBHDF5)
|
||||
|
||||
# Source files for the programs
|
17
hdf5.spec
17
hdf5.spec
@ -1,13 +1,13 @@
|
||||
%define snaprel -snap12
|
||||
%define snaprel %{nil}
|
||||
Name: hdf5
|
||||
Version: 1.8.3
|
||||
Release: 3.snap12%{?dist}
|
||||
Version: 1.8.4
|
||||
Release: 1%{?dist}
|
||||
Summary: A general purpose library and file format for storing scientific data
|
||||
License: BSD
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.hdfgroup.org/HDF5/
|
||||
#Source0: ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.gz
|
||||
Source0: ftp://ftp.hdfgroup.uiuc.edu/pub/outgoing/hdf5/snapshots/v18/hdf5-%{version}%{?snaprel}.tar.gz
|
||||
Source0: http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-%{version}%{?snaprel}.tar.bz2
|
||||
Source1: h5comp
|
||||
Patch1: hdf5-1.8.3-snap12-signal.patch
|
||||
Patch3: hdf5-1.8.0-multiarch.patch
|
||||
@ -15,7 +15,7 @@ Patch3: hdf5-1.8.0-multiarch.patch
|
||||
# string will be NULL terminated. The tstlite test ends up crashing with
|
||||
# a stack smash. Reported upstream 9/30/2009, but probably will take a bit
|
||||
# of work to fix. This disables that test
|
||||
Patch4: hdf5-1.8.3-snap12-tstlite.patch
|
||||
Patch4: hdf5-1.8.4-tstlite.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
|
||||
|
||||
@ -59,7 +59,7 @@ find -name '*.[ch]' -o -name '*.f90' -exec chmod -x {} +
|
||||
export CC=gcc
|
||||
export CXX=g++
|
||||
export F9X=gfortran
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
export CFLAGS="${RPM_OPT_FLAGS/O2/O0}"
|
||||
%configure \
|
||||
--disable-dependency-tracking \
|
||||
--enable-cxx \
|
||||
@ -164,6 +164,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jan 6 2010 Orion Poplawski <orion@cora.nwra.com> 1.8.4-1
|
||||
- Update to 1.8.4
|
||||
- Must compile with -O0 due to gcc-4.4 incompatability
|
||||
- No longer need -fno-strict-aliasing
|
||||
|
||||
* Thu Oct 1 2009 Orion Poplawski <orion@cora.nwra.com> 1.8.3-3.snap12
|
||||
- Update to 1.8.3-snap12
|
||||
- Update signal patch
|
||||
|
Loading…
Reference in New Issue
Block a user