From b0ee8879e78c10a10495c81877173dfe0717b9de Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 25 May 2007 22:08:50 +0000 Subject: [PATCH] Bump to 3.1.1. All of my bugfixes got sucked in, a much cleaner build. --- .cvsignore | 1 + Makefile.blas | 2 +- Makefile.lapack | 10 ++++---- lapack-3.1.1-make.inc.patch | 23 +++++++++++++++++++ lapack.spec | 46 ++++++++++++++++--------------------- sources | 2 +- 6 files changed, 51 insertions(+), 33 deletions(-) create mode 100644 lapack-3.1.1-make.inc.patch diff --git a/.cvsignore b/.cvsignore index cfcace4..a12e38e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,3 +3,4 @@ manpages.tar.bz2 manpages.tgz lapack.tgz lapack-3.1.0.tgz +lapack-3.1.1.tgz diff --git a/Makefile.blas b/Makefile.blas index e456e49..a269018 100644 --- a/Makefile.blas +++ b/Makefile.blas @@ -28,4 +28,4 @@ static: $(OBJS) ranlib libblas.a shared: $(OBJS) - cc $(CFLAGS) -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.1 $(OBJS) -lm -lgfortran -lc diff --git a/Makefile.lapack b/Makefile.lapack index acd9a0f..7c15195 100644 --- a/Makefile.lapack +++ b/Makefile.lapack @@ -42,7 +42,7 @@ OBJS= cbdsqr.o cgbbrd.o cgbcon.o cgbequ.o cgbrfs.o cgbsv.o \ cpptri.o cpptrs.o cptcon.o cpteqr.o cptrfs.o cptsv.o \ cptsvx.o cpttrf.o cpttrs.o cptts2.o crot.o cspcon.o \ cspmv.o cspr.o csprfs.o cspsv.o cspsvx.o csptrf.o \ - csptri.o csptrs.o csrot.o csrscl.o cstedc.o cstegr.o \ + csptri.o csptrs.o csrscl.o cstedc.o cstegr.o \ cstein.o cstemr.o csteqr.o csycon.o csymv.o csyr.o \ csyrfs.o csysv.o csysvx.o csytf2.o csytrf.o csytri.o \ csytrs.o ctbcon.o ctbrfs.o ctbtrs.o ctgevc.o ctgex2.o \ @@ -173,7 +173,7 @@ OBJS= cbdsqr.o cgbbrd.o cgbcon.o cgbequ.o cgbrfs.o cgbsv.o \ stgsy2.o stgsyl.o stpcon.o stprfs.o stptri.o stptrs.o \ strcon.o strevc.o strexc.o strrfs.o strsen.o strsna.o \ strsyl.o strti2.o strtri.o strtrs.o stzrqf.o stzrzf.o \ - xerbla.o zbdsqr.o zcgesv.o zdrot.o zdrscl.o zgbbrd.o \ + xerbla.o zbdsqr.o zcgesv.o zdrscl.o zgbbrd.o \ zgbcon.o zgbequ.o zgbrfs.o zgbsv.o zgbsvx.o zgbtf2.o \ zgbtrf.o zgbtrs.o zgebak.o zgebal.o zgebd2.o zgebrd.o \ zgecon.o zgeequ.o zgees.o zgeesx.o zgeev.o zgeevx.o \ @@ -226,12 +226,12 @@ OBJS= cbdsqr.o cgbbrd.o cgbcon.o cgbequ.o cgbrfs.o cgbsv.o \ zungql.o zungqr.o zungr2.o zungrq.o zungtr.o zunm2l.o \ zunm2r.o zunmbr.o zunmhr.o zunml2.o zunmlq.o zunmql.o \ zunmqr.o zunmr2.o zunmr3.o zunmrq.o zunmrz.o zunmtr.o \ - zupgtr.o zupmtr.o ../INSTALL/dlamch.o ../INSTALL/dsecnd.o \ - ../INSTALL/lsame.o ../INSTALL/second.o ../INSTALL/slamch.o + zupgtr.o zupmtr.o ../INSTALL/dlamch.o ../INSTALL/dsecnd_INT_ETIME.o \ + ../INSTALL/lsame.o ../INSTALL/second_INT_ETIME.o ../INSTALL/slamch.o static: $(OBJS) ar ruv liblapack.a $(OBJS) ranlib liblapack.a shared: $(OBJS) - cc $(CFLAGS) -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.1 $(OBJS) -L.. -lblas -lm -lgfortran -lc diff --git a/lapack-3.1.1-make.inc.patch b/lapack-3.1.1-make.inc.patch new file mode 100644 index 0000000..c807ccb --- /dev/null +++ b/lapack-3.1.1-make.inc.patch @@ -0,0 +1,23 @@ +--- lapack-3.1.1/INSTALL/make.inc.gfortran.BAD 2007-05-25 15:34:55.000000000 -0500 ++++ lapack-3.1.1/INSTALL/make.inc.gfortran 2007-05-25 15:35:51.000000000 -0500 +@@ -8,7 +8,7 @@ SHELL = /bin/sh + # + # The machine (platform) identifier to append to the library names + # +-PLAT = _LINUX ++PLAT = + # + # Modify the FORTRAN and OPTS definitions to refer to the + # compiler and desired compiler options for your machine. NOOPT +@@ -17,9 +17,9 @@ PLAT = _LINUX + # desired load options for your machine. + # + FORTRAN = gfortran +-OPTS = -O2 ++#OPTS = -O2 + DRVOPTS = $(OPTS) +-NOOPT = -O0 ++NOOPT = + LOADER = gfortran + LOADOPTS = + # diff --git a/lapack.spec b/lapack.spec index 96ad738..bd44143 100644 --- a/lapack.spec +++ b/lapack.spec @@ -1,7 +1,7 @@ Summary: The LAPACK libraries for numerical linear algebra. Name: lapack -Version: 3.1.0 -Release: 4%{?dist} +Version: 3.1.1 +Release: 1%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/lapack/ @@ -10,10 +10,7 @@ Source2: Makefile.blas Source3: Makefile.lapack Source4: http://www.netlib.org/lapack/lapackqref.ps 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 +Patch3: lapack-3.1.1-make.inc.patch Obsoletes: lapack-man BuildRequires: gcc-gfortran BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -60,12 +57,8 @@ BLAS development libraries for applications that link statically. %prep %setup -q %setup -q -D -T -# Adds 8 missing BLAS functions from upstream tarball -%patch1 -p1 -# Fix Bugzilla 169558 -# %patch2 -p1 %patch3 -p1 -%patch4 -p1 +cp -f INSTALL/make.inc.gfortran make.inc cp -f $RPM_SOURCE_DIR/Makefile.blas BLAS/SRC/Makefile cp -f $RPM_SOURCE_DIR/Makefile.lapack SRC/Makefile @@ -85,17 +78,17 @@ cp libblas.a ${RPM_BUILD_DIR}/%{name}-%{version}/ make clean FFLAGS="$RPM_OPT_O_FLAGS -fPIC" make dcabs1.o FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" make shared -cp libblas.so.3.1.0 ${RPM_BUILD_DIR}/%{name}-%{version}/ +cp libblas.so.3.1.1 ${RPM_BUILD_DIR}/%{name}-%{version}/ popd -ln -s libblas.so.3.1.0 libblas.so +ln -s libblas.so.3.1.1 libblas.so # Some files don't like -O2, but -Os is fine RPM_OPT_SIZE_FLAGS=$(echo $RPM_OPT_FLAGS | sed 's|-O2|-Os|') # Build the static dlamch, dsecnd, lsame, second, slamch bits pushd INSTALL -make NOOPT="$RPM_OPT_SIZE_FLAGS" OPTS="$RPM_OPT_FLAGS" dlamch.o dsecnd.o lsame.o second.o slamch.o +make NOOPT="$RPM_OPT_SIZE_FLAGS" OPTS="$RPM_OPT_FLAGS" popd # Build the static lapack library @@ -107,22 +100,20 @@ popd # Build the shared dlamch, dsecnd, lsame, second, slamch bits pushd INSTALL make clean -make NOOPT="$RPM_OPT_SIZE_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC" \ - dlamch.o dsecnd.o lsame.o second.o slamch.o +make NOOPT="$RPM_OPT_SIZE_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC" popd # Build the shared lapack library pushd SRC make clean make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" shared -cp liblapack.so.3.1.0 ${RPM_BUILD_DIR}/%{name}-%{version}/ +cp liblapack.so.3.1.1 ${RPM_BUILD_DIR}/%{name}-%{version}/ popd # Buuld the static with pic dlamch, dsecnd, lsame, second, slamch bits pushd INSTALL make clean -make NOOPT="$RPM_OPT_SIZE_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC" \ - dlamch.o dsecnd.o lsame.o second.o slamch.o +make NOOPT="$RPM_OPT_SIZE_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC" popd # Build the static with pic lapack library @@ -140,7 +131,7 @@ rm -fr ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}%{_libdir} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/manl -for f in liblapack.so.3.1.0 libblas.so.3.1.0 libblas.a liblapack.a liblapack_pic.a; do +for f in liblapack.so.3.1.1 libblas.so.3.1.1 libblas.a liblapack.a liblapack_pic.a; do cp -f $f ${RPM_BUILD_ROOT}%{_libdir}/$f done @@ -155,12 +146,12 @@ cp -f manpages/blas/man/manl/* ${RPM_BUILD_ROOT}%{_mandir}/manl cp -f manpages/man/manl/* ${RPM_BUILD_ROOT}%{_mandir}/manl cd ${RPM_BUILD_ROOT}%{_libdir} -ln -sf liblapack.so.3.1.0 liblapack.so -ln -sf liblapack.so.3.1.0 liblapack.so.3 -ln -sf liblapack.so.3.1.0 liblapack.so.3.1 -ln -sf libblas.so.3.1.0 libblas.so -ln -sf libblas.so.3.1.0 libblas.so.3 -ln -sf libblas.so.3.1.0 libblas.so.3.1 +ln -sf liblapack.so.3.1.1 liblapack.so +ln -sf liblapack.so.3.1.1 liblapack.so.3 +ln -sf liblapack.so.3.1.1 liblapack.so.3.1 +ln -sf libblas.so.3.1.1 libblas.so +ln -sf libblas.so.3.1.1 libblas.so.3 +ln -sf libblas.so.3.1.1 libblas.so.3.1 %post -p /sbin/ldconfig @@ -194,6 +185,9 @@ rm -fr ${RPM_BUILD_ROOT} %{_libdir}/libblas*.a %changelog +* Fri May 25 2007 Tom "spot" Callaway 3.1.1-1 +- bump to 3.1.1 + * Fri Jan 5 2007 Tom "spot" Callaway 3.1.0-4 - fix bugzillas 219740,219741 diff --git a/sources b/sources index 20a8292..60c7d15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ff8c5d81117163376875343e64d04a1 lapack-3.1.0.tgz +00b21551a899bcfbaa7b8443e1faeef9 lapack-3.1.1.tgz