rpms/lapack/FC-6 lapack-3.1.0-no-external-etime.patch, NONE, 1.1 Makefile.blas, 1.3, 1.4 Makefile.lapack, 1.2, 1.3 lapack.spec, 1.14, 1.15

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/lapack/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19217/FC-6

Modified Files:
	Makefile.blas Makefile.lapack lapack.spec 
Added Files:
	lapack-3.1.0-no-external-etime.patch 
Log Message:

Fix bugzilla 219740/219741


lapack-3.1.0-no-external-etime.patch:

--- NEW FILE lapack-3.1.0-no-external-etime.patch ---
--- 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 ..
 *


Index: Makefile.blas
===================================================================
RCS file: /cvs/extras/rpms/lapack/FC-6/Makefile.blas,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.blas	21 Dec 2006 00:16:17 -0000	1.3
+++ Makefile.blas	6 Jan 2007 02:56:35 -0000	1.4
@@ -28,4 +28,4 @@
 	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


Index: Makefile.lapack
===================================================================
RCS file: /cvs/extras/rpms/lapack/FC-6/Makefile.lapack,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.lapack	21 Dec 2006 00:16:17 -0000	1.2
+++ Makefile.lapack	6 Jan 2007 02:56:35 -0000	1.3
@@ -234,4 +234,4 @@
 	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


Index: lapack.spec
===================================================================
RCS file: /cvs/extras/rpms/lapack/FC-6/lapack.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- lapack.spec	21 Dec 2006 01:20:05 -0000	1.14
+++ lapack.spec	6 Jan 2007 02:56:35 -0000	1.15
@@ -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 @@
 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 @@
 # 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 @@
 # 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 @@
 
 # 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 @@
 # 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 @@
 # 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 @@
 %{_libdir}/libblas*.a
 
 %changelog
+* Fri Jan  5 2007 Tom "spot" Callaway <tcallawa at redhat.com> 3.1.0-4
+- fix bugzillas 219740,219741
+
 * Wed Dec 20 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.1.0-3
 - make clean everywhere