Add patch to build on ppc

This commit is contained in:
Orion Poplawski 2006-02-02 22:10:26 +00:00
parent aad1b026ef
commit 2cac9a7872
2 changed files with 74 additions and 2 deletions

68
hdf-4.2r1-ppc.patch Normal file
View File

@ -0,0 +1,68 @@
--- HDF4.2r1/hdf/src/hdfi.h.orig 2005-01-24 20:36:44.000000000 -0700
+++ HDF4.2r1/hdf/src/hdfi.h 2006-02-02 21:54:59.347516688 -0700
@@ -72,6 +72,7 @@
#define DFMT_CRAYMPP 0x1171
#define DFMT_IA64 0x4441
#define DFMT_LINUX64 0x4441
+#define DFMT_LINUXPPC 0x1111
/* I/O library constants */
#define UNIXUNBUFIO 1
@@ -1326,6 +1327,57 @@
#endif /*Linux 64 */
+/* Linux PPC */
+#if defined __PPC__
+
+#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 */
+
/*#ifndef GOT_MACHINE
No machine type has been defined. Your Makefile needs to have someing like
-DSUN or -DUNICOS in order for the HDF internal structures to be defined

View File

@ -1,6 +1,6 @@
Name: hdf Name: hdf
Version: 4.2r1 Version: 4.2r1
Release: 6%{?dist} Release: 7%{?dist}
Summary: A general purpose library and file format for storing scientific data Summary: A general purpose library and file format for storing scientific data
License: BSD-ish License: BSD-ish
Group: System Environment/Libraries Group: System Environment/Libraries
@ -8,10 +8,10 @@ URL: http://hdf.ncsa.uiuc.edu/hdf4.html
Source0: ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/HDF%{version}.tar.gz Source0: ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/HDF%{version}.tar.gz
Source1: ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/patches/4.2r1-hrepack-patch.tar Source1: ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/patches/4.2r1-hrepack-patch.tar
Patch0: hdf-4.2r1-configure.patch Patch0: hdf-4.2r1-configure.patch
Patch1: hdf-4.2r1-ppc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf flex byacc libjpeg-devel zlib-devel BuildRequires: autoconf flex byacc libjpeg-devel zlib-devel
BuildRequires: gcc-gfortran BuildRequires: gcc-gfortran
ExcludeArch: ppc ppc64
%description %description
HDF is a general purpose library and file format for storing scientific data. HDF is a general purpose library and file format for storing scientific data.
@ -37,6 +37,7 @@ tar xf %{SOURCE1} --directory mfhdf/hrepack
mv mfhdf/hrepack/4.2r1-hrepack-patch/*.[ch] mfhdf/hrepack mv mfhdf/hrepack/4.2r1-hrepack-patch/*.[ch] mfhdf/hrepack
rm -r mfhdf/hrepack/4.2r1-hrepack-patch rm -r mfhdf/hrepack/4.2r1-hrepack-patch
%patch0 -p1 -b .orig %patch0 -p1 -b .orig
%patch1 -p1 -b .orig
%build %build
autoconf autoconf
@ -73,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/%{name}/ %{_libdir}/%{name}/
%changelog %changelog
* Thu Feb 2 2006 Orion Poplawski <orion@cora.nwra.com> 4.2r1-7
- Add patch to build on ppc
* Wed Dec 21 2005 Orion Poplawski <orion@cora.nwra.com> 4.2r1-6 * Wed Dec 21 2005 Orion Poplawski <orion@cora.nwra.com> 4.2r1-6
- Rebuild - Rebuild