rpms/hdf5/FC-4 hdf5-1.6.5-flags.patch,NONE,1.1 hdf5.spec,1.7,1.8
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Mon Mar 13 20:10:28 UTC 2006
- Previous message (by thread): rpms/rogue/devel rogue.png, NONE, 1.1 rogue.desktop, 1.1, 1.2 rogue.spec, 1.2, 1.3
- Next message (by thread): rpms/hdf5/FC-3 hdf5-1.6.5-flags.patch,NONE,1.1 hdf5.spec,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: orion
Update of /cvs/extras/rpms/hdf5/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15179
Modified Files:
hdf5.spec
Added Files:
hdf5-1.6.5-flags.patch
Log Message:
Add patch to avoid HDF setting the compiler flags
hdf5-1.6.5-flags.patch:
--- NEW FILE hdf5-1.6.5-flags.patch ---
--- hdf5-1.6.5/config/gnu-flags.orig 2005-10-28 14:15:26.000000000 -0600
+++ hdf5-1.6.5/config/gnu-flags 2006-03-13 10:59:58.000000000 -0700
@@ -107,25 +107,6 @@
gcc*|egcs*|pgcc*)
# Architecture-specific flags
arch=
- case "$host_os-$host_cpu" in
- # FreeBSD sets the information from "uname -m" to the general machine
- # architecture, not the specific CPU for the machine, so even our
- # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD
- # machine, use the "sysctl" command to get the CPU hardware model.
- freebsd*-i386)
- host_cpu_model=`sysctl -n hw.model`
- case "$host_cpu_model" in
- # Hmm.. this might not catch Celerons, but it won't hurt them either...
- *Pro*|*II*|*III*|*IV*|*Athlon*)
- arch="-march=i686"
- ;;
- esac
- ;;
-
- *-i686)
- arch="-march=i686"
- ;;
- esac
# Host-specific flags
case "`hostname`" in
--- hdf5-1.6.5/fortran/config/gnu-flags.orig 2005-10-28 14:57:02.000000000 -0600
+++ hdf5-1.6.5/fortran/config/gnu-flags 2006-03-13 10:59:22.000000000 -0700
@@ -107,25 +107,6 @@
gcc*|egcs*|pgcc*)
# Architecture-specific flags
arch=
- case "$host_os-$host_cpu" in
- # FreeBSD sets the information from "uname -m" to the general machine
- # architecture, not the specific CPU for the machine, so even our
- # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD
- # machine, use the "sysctl" command to get the CPU hardware model.
- freebsd*-i386)
- host_cpu_model=`sysctl -n hw.model`
- case "$host_cpu_model" in
- # Hmm.. this might not catch Celerons, but it won't hurt them either...
- *Pro*|*II*|*III*|*IV*|*Athlon*)
- arch="-march=i686"
- ;;
- esac
- ;;
-
- *-i686)
- arch="-march=i686"
- ;;
- esac
# Host-specific flags
case "`hostname`" in
Index: hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf5/FC-4/hdf5.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hdf5.spec 21 Dec 2005 21:55:39 -0000 1.7
+++ hdf5.spec 13 Mar 2006 20:10:28 -0000 1.8
@@ -1,6 +1,6 @@
Name: hdf5
Version: 1.6.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A general purpose library and file format for storing scientific data
License: BSD-ish
Group: System Environment/Libraries
@@ -12,6 +12,7 @@
Patch3: hdf5-1.6.4-testh5repack.patch
Patch4: hdf5-1.6.5-h5diff_attr.patch
Patch5: hdf5-1.6.4-ppc.patch
+Patch6: hdf5-1.6.5-flags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-gfortran >= 4.0.2, krb5-devel, openssl-devel, zlib-devel, time
@@ -40,6 +41,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1 -b .flags
%build
autoconf
@@ -95,6 +97,9 @@
%{_libdir}/*.mod
%changelog
+* Mon Mar 13 2006 Orion Poplawski <orion at cora.nwra.com> 1.6.5-3
+- Add patch to avoid HDF setting the compiler flags
+
* Wed Dec 21 2005 Orion Poplawski <orion at cora.nwra.com> 1.6.5-2
- Don't ship h5perf with missing library
- Previous message (by thread): rpms/rogue/devel rogue.png, NONE, 1.1 rogue.desktop, 1.1, 1.2 rogue.spec, 1.2, 1.3
- Next message (by thread): rpms/hdf5/FC-3 hdf5-1.6.5-flags.patch,NONE,1.1 hdf5.spec,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list