- Add patch to add -lm to hdiff link
This commit is contained in:
parent
e8897eaba1
commit
5cc4fdec2d
|
@ -0,0 +1,22 @@
|
||||||
|
--- HDF4.2r2/mfhdf/hdiff/Makefile.in.libm 2008-02-05 14:36:29.000000000 -0700
|
||||||
|
+++ HDF4.2r2/mfhdf/hdiff/Makefile.in 2008-02-05 14:36:52.000000000 -0700
|
||||||
|
@@ -196,7 +196,7 @@
|
||||||
|
hdiff_mattbl.c hdiff_gattr.c hdiff_misc.c hdiff_sds.c \
|
||||||
|
hdiff_table.c hdiff_vs.c hdiff_dim.c
|
||||||
|
|
||||||
|
-hdiff_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
|
||||||
|
+hdiff_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a -lm
|
||||||
|
hdiff_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
|
||||||
|
|
||||||
|
#############################################################################
|
||||||
|
--- HDF4.2r2/mfhdf/hrepack/Makefile.in.libm 2007-09-18 09:12:00.000000000 -0600
|
||||||
|
+++ HDF4.2r2/mfhdf/hrepack/Makefile.in 2008-02-05 14:58:41.000000000 -0700
|
||||||
|
@@ -232,7 +232,7 @@
|
||||||
|
../hdiff/hdiff_sds.c ../hdiff/hdiff_table.c \
|
||||||
|
../hdiff/hdiff_vs.c ../hdiff/hdiff_dim.c
|
||||||
|
|
||||||
|
-test_hrepack_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
|
||||||
|
+test_hrepack_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a -lm
|
||||||
|
test_hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
|
||||||
|
hrepack_check_SOURCES = hrepack_check.c
|
||||||
|
hrepack_check_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
|
7
hdf.spec
7
hdf.spec
|
@ -1,6 +1,6 @@
|
||||||
Name: hdf
|
Name: hdf
|
||||||
Version: 4.2r2
|
Version: 4.2r2
|
||||||
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
|
License: BSD
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
|
@ -10,6 +10,7 @@ Patch0: hdf-4.2r1p4-maxavailfiles.patch
|
||||||
Patch1: hdf-4.2r2-ppc.patch
|
Patch1: hdf-4.2r2-ppc.patch
|
||||||
Patch2: hdf-4.2r2-sparc.patch
|
Patch2: hdf-4.2r2-sparc.patch
|
||||||
Patch3: hdf-4.2r2-s390.patch
|
Patch3: hdf-4.2r2-s390.patch
|
||||||
|
Patch4: hdf-4.2r2-libm.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: flex byacc libjpeg-devel zlib-devel
|
BuildRequires: flex byacc libjpeg-devel zlib-devel
|
||||||
BuildRequires: gcc-gfortran
|
BuildRequires: gcc-gfortran
|
||||||
|
@ -41,6 +42,7 @@ HDF development headers and libraries.
|
||||||
%patch1 -p1 -b .ppc
|
%patch1 -p1 -b .ppc
|
||||||
%patch2 -p1 -b .sparc
|
%patch2 -p1 -b .sparc
|
||||||
%patch3 -p1 -b .s390
|
%patch3 -p1 -b .s390
|
||||||
|
%patch4 -p1 -b .libm
|
||||||
|
|
||||||
chmod a-x *hdf/*/*.c hdf/*/*.h
|
chmod a-x *hdf/*/*.c hdf/*/*.h
|
||||||
# restore include file timestamps modified by patching
|
# restore include file timestamps modified by patching
|
||||||
|
@ -111,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 5 2008 Orion Poplawski <orion@cora.nwra.com> 4.2.r2-7
|
||||||
|
- Add patch to add -lm to hdiff link
|
||||||
|
|
||||||
* Tue Feb 5 2008 Orion Poplawski <orion@cora.nwra.com> 4.2.r2-6
|
* Tue Feb 5 2008 Orion Poplawski <orion@cora.nwra.com> 4.2.r2-6
|
||||||
- Add patch for s390 support (bug #431511)
|
- Add patch for s390 support (bug #431511)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue