diff --git a/lapack-3.4.0-lapacke-shared.patch b/lapack-3.4.0-lapacke-shared.patch deleted file mode 100644 index c8ea2d4..0000000 --- a/lapack-3.4.0-lapacke-shared.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -up lapack-3.4.0/lapacke/Makefile.fedora lapack-3.4.0/lapacke/Makefile ---- lapack-3.4.0/lapacke/Makefile.fedora 2011-11-29 09:13:01.433799657 -0500 -+++ lapack-3.4.0/lapacke/Makefile 2011-11-29 09:15:03.035199954 -0500 -@@ -48,6 +48,9 @@ lapacke: - cd src && $(MAKE) - cd utils && $(MAKE) - -+shlib: lapacke -+ $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHLIB_LAPACKE).@SHORTVER@ -o $(SHLIB_LAPACKE).@LONGVER@ src/*.o utils/*.o $(LIBS) -lgfortran -lc -+ - clean: cleanlib - - cleanlib: -diff -up lapack-3.4.0/lapacke/make.inc.fedora lapack-3.4.0/lapacke/make.inc ---- lapack-3.4.0/lapacke/make.inc.fedora 2011-11-29 09:11:35.717927221 -0500 -+++ lapack-3.4.0/lapacke/make.inc 2011-11-29 09:17:08.068555023 -0500 -@@ -50,14 +50,14 @@ - CC = gcc - CFLAGS = - LINKER = gfortran --LDFLAGS = -+LDFLAGS = $(RPM_LD_FLAGS) - # - # The name of the libraries to be created/linked to - # Ensure that the libraries have the same data model (LP64/ILP64). - # --LAPACKE = lapacke.a --LIBS = /Users/julie/Documents/Boulot/lapack-dev/lapack/trunk/lapack_LINUX.a \ -- /Users/julie/Documents/Boulot/lapack-dev/lapack/trunk/blas_LINUX.a -lm -+LAPACKE = liblapacke.a -+SHLIB_LAPACKE = liblapacke.so -+LIBS = -L.. -llapack -lblas -lm - # The archiver and the flag(s) to use when building archive (library) - # If your system has no ranlib, set RANLIB = echo. - # diff --git a/lapack-3.4.1-lapacke-shared.patch b/lapack-3.4.1-lapacke-shared.patch new file mode 100644 index 0000000..ccf0d5d --- /dev/null +++ b/lapack-3.4.1-lapacke-shared.patch @@ -0,0 +1,21 @@ +diff -up lapack-3.4.1/INSTALL/make.inc.gfortran.shared lapack-3.4.1/INSTALL/make.inc.gfortran +--- lapack-3.4.1/INSTALL/make.inc.gfortran.shared 2012-09-06 21:55:01.659280432 -0600 ++++ lapack-3.4.1/INSTALL/make.inc.gfortran 2012-09-06 22:04:04.936732440 -0600 +@@ -73,3 +73,4 @@ BLASLIB = ../../librefblas.a + LAPACKLIB = liblapack.a + TMGLIB = libtmglib.a + LAPACKELIB = liblapacke.a ++SHLIB_LAPACKE = liblapacke.so +diff -up lapack-3.4.1/lapacke/Makefile.shared lapack-3.4.1/lapacke/Makefile +--- lapack-3.4.1/lapacke/Makefile.shared 2012-04-12 17:05:47.000000000 -0600 ++++ lapack-3.4.1/lapacke/Makefile 2012-09-06 21:55:01.851271802 -0600 +@@ -49,6 +49,9 @@ lapacke: + cd src && $(MAKE) + cd utils && $(MAKE) + ++shlib: lapacke ++ $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHLIB_LAPACKE).@SHORTVER@ -o $(SHLIB_LAPACKE).@LONGVER@ src/*.o utils/*.o $(LIBS) -lgfortran -lc ++ + lapacke_example: + cd example && $(MAKE) + diff --git a/lapack.spec b/lapack.spec index 0f966ac..3d201f0 100644 --- a/lapack.spec +++ b/lapack.spec @@ -15,7 +15,7 @@ Source3: Makefile.lapack Source4: http://www.netlib.org/lapack/lapackqref.ps Source5: http://www.netlib.org/blas/blasqr.ps Patch3: lapack-3.4.0-make.inc.patch -Patch4: lapack-3.4.0-lapacke-shared.patch +Patch4: lapack-3.4.1-lapacke-shared.patch BuildRequires: gcc-gfortran %description @@ -267,6 +267,7 @@ ln -sf liblapacke.so.%{version} liblapacke.so.%{mediumver} %changelog * Thu Sep 06 2012 Orion Poplawski - 3.4.1-1 - Update to 3.4.1 +- Rebase lapacke shared lib patch * Thu Jul 19 2012 Fedora Release Engineering - 3.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild