Fix bugzilla 219740/219741

This commit is contained in:
Tom Callaway 2007-01-06 02:56:35 +00:00
parent 9f6f371313
commit c4addfaaa2
4 changed files with 33 additions and 8 deletions

View File

@ -28,4 +28,4 @@ static: $(OBJS)
ranlib libblas.a
shared: $(OBJS)
cc -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.1.0 $(OBJS) -lm -lgfortran -lc
cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.1.0 $(OBJS) -lm -lgfortran -lc

View File

@ -234,4 +234,4 @@ static: $(OBJS)
ranlib liblapack.a
shared: $(OBJS)
cc -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.1.0 $(OBJS) -L.. -lblas -lm -lgfortran -lc
cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.1.0 $(OBJS) -L.. -lblas -lm -lgfortran -lc

View File

@ -0,0 +1,20 @@
--- lapack-3.1.0/INSTALL/dsecnd.f.BAD 2007-01-05 20:35:09.000000000 -0600
+++ lapack-3.1.0/INSTALL/dsecnd.f 2007-01-05 20:35:16.000000000 -0600
@@ -20,7 +20,6 @@
* ..
* .. External Functions ..
REAL ETIME
- EXTERNAL ETIME
* ..
* .. Executable Statements ..
*
--- lapack-3.1.0/INSTALL/second.f.BAD 2007-01-05 20:35:39.000000000 -0600
+++ lapack-3.1.0/INSTALL/second.f 2007-01-05 20:35:45.000000000 -0600
@@ -20,7 +20,6 @@
* ..
* .. External Functions ..
REAL ETIME
- EXTERNAL ETIME
* ..
* .. Executable Statements ..
*

View File

@ -1,7 +1,7 @@
Summary: The LAPACK libraries for numerical linear algebra.
Name: lapack
Version: 3.1.0
Release: 3%{?dist}
Release: 4%{?dist}
License: Freely distributable
Group: Development/Libraries
URL: http://www.netlib.org/lapack/
@ -13,6 +13,7 @@ Source5: http://www.netlib.org/blas/blasqr.ps
Patch1: blas-bz143340.patch
Patch2: lapack-fixlwork.patch
Patch3: lapack-3.1.0-make.inc.patch
Patch4: lapack-3.1.0-no-external-etime.patch
Obsoletes: lapack-man
BuildRequires: gcc-gfortran
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -64,6 +65,7 @@ BLAS development libraries for applications that link statically.
# Fix Bugzilla 169558
# %patch2 -p1
%patch3 -p1
%patch4 -p1
cp -f $RPM_SOURCE_DIR/Makefile.blas BLAS/SRC/Makefile
cp -f $RPM_SOURCE_DIR/Makefile.lapack SRC/Makefile
@ -78,11 +80,11 @@ export FC=gfortran
# Build BLAS
pushd BLAS/SRC
FFLAGS="$RPM_OPT_O_FLAGS" make dcabs1.o
FFLAGS="$RPM_OPT_FLAGS" make static
FFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" make static
cp libblas.a ${RPM_BUILD_DIR}/%{name}-%{version}/
make clean
FFLAGS="$RPM_OPT_O_FLAGS -fPIC" make dcabs1.o
FFLAGS="$RPM_OPT_FLAGS -fPIC" make shared
FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" make shared
cp libblas.so.3.1.0 ${RPM_BUILD_DIR}/%{name}-%{version}/
popd
@ -98,7 +100,7 @@ popd
# Build the static lapack library
pushd SRC
make FFLAGS="$RPM_OPT_FLAGS" static
make FFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" static
cp liblapack.a ${RPM_BUILD_DIR}/%{name}-%{version}/
popd
@ -112,7 +114,7 @@ popd
# Build the shared lapack library
pushd SRC
make clean
make FFLAGS="$RPM_OPT_FLAGS -fPIC" shared
make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" shared
cp liblapack.so.3.1.0 ${RPM_BUILD_DIR}/%{name}-%{version}/
popd
@ -126,7 +128,7 @@ popd
# Build the static with pic lapack library
pushd SRC
make clean
make FFLAGS="$RPM_OPT_FLAGS -fPIC" static
make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" static
cp liblapack.a ${RPM_BUILD_DIR}/%{name}-%{version}/liblapack_pic.a
popd
@ -192,6 +194,9 @@ rm -fr ${RPM_BUILD_ROOT}
%{_libdir}/libblas*.a
%changelog
* Fri Jan 5 2007 Tom "spot" Callaway <tcallawa@redhat.com> 3.1.0-4
- fix bugzillas 219740,219741
* Wed Dec 20 2006 Tom "spot" Callaway <tcallawa@redhat.com> 3.1.0-3
- make clean everywhere