From cf4e4693909481d772e60b2bb6788fc2e588f4d2 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 23 Nov 2007 14:33:57 +0000 Subject: [PATCH] - Add patch to build on alpha --- hdf5-1.6.6-alpha.patch | 17 +++++++++++++++++ hdf5.spec | 7 ++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 hdf5-1.6.6-alpha.patch diff --git a/hdf5-1.6.6-alpha.patch b/hdf5-1.6.6-alpha.patch new file mode 100644 index 0000000..e3ac4fb --- /dev/null +++ b/hdf5-1.6.6-alpha.patch @@ -0,0 +1,17 @@ +--- hdf5-1.6.6/fortran/src/H5f90i.h.alpha 2007-11-23 07:30:29.000000000 -0700 ++++ hdf5-1.6.6/fortran/src/H5f90i.h 2007-11-23 07:30:45.000000000 -0700 +@@ -188,14 +188,10 @@ + + #if defined __alpha__ && defined __linux__ + +-typedef char *_fcd; + typedef long long haddr_t_f; + typedef long long hsize_t_f; + typedef long long hssize_t_f; + typedef long long size_t_f; +-typedef int int_f; +-typedef int hid_t_f; +-typedef float real_f; + #define FNAME_POST2_UNDERSCORE + #define _fcdtocp(desc) (desc) + diff --git a/hdf5.spec b/hdf5.spec index 1a440a6..1dd7095 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -1,6 +1,6 @@ Name: hdf5 Version: 1.6.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD Group: System Environment/Libraries @@ -13,6 +13,7 @@ Patch5: hdf5-1.6.4-ppc.patch Patch7: hdf5-1.6.5-x86_64.patch Patch8: hdf5-1.6.5-sort.patch Patch10: hdf5-1.6.5-open.patch +Patch11: hdf5-1.6.6-alpha.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time @@ -42,6 +43,7 @@ HDF5 development headers and libraries. %patch7 -p1 -b .x86_64 %patch8 -p1 -b .sort %patch10 -p1 -b .open +%patch11 -p1 -b .alpha %build @@ -105,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Nov 23 2007 Orion Poplawski 1.6.6-2 +- Add patch to build on alpha + * Wed Oct 17 2007 Orion Poplawski 1.6.6-1 - Update to 1.6.6, drop upstreamed patches - Explicitly set compilers