From 29005a029c7f423736cb62e41ef43e92d1733e98 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 19 Jun 2014 18:07:15 -0400 Subject: [PATCH] use compiled tmglib .o files, not static lib --- lapack-3.5.0-lapacke-tmglib.patch | 4 ++-- lapack.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lapack-3.5.0-lapacke-tmglib.patch b/lapack-3.5.0-lapacke-tmglib.patch index 926ec49..8bcff41 100644 --- a/lapack-3.5.0-lapacke-tmglib.patch +++ b/lapack-3.5.0-lapacke-tmglib.patch @@ -6,7 +6,7 @@ diff -up lapack-3.5.0/lapacke/Makefile.tmglib lapack-3.5.0/lapacke/Makefile shlib: lapacke - $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHLIB_LAPACKE).@SHORTVER@ -o $(SHLIB_LAPACKE).@LONGVER@ src/*.o utils/*.o $(LIBS) -lgfortran -lc -+ $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHLIB_LAPACKE).@SHORTVER@ -o $(SHLIB_LAPACKE).@LONGVER@ src/*.o utils/*.o $(LIBS) -lgfortran -lc ../$(TMGLIB) ++ $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHLIB_LAPACKE).@SHORTVER@ -o $(SHLIB_LAPACKE).@LONGVER@ src/*.o utils/*.o $(LIBS) -lgfortran -lc ../TESTING/MATGEN/*.o lapacke_example: cd example && $(MAKE) @@ -18,7 +18,7 @@ diff -up lapack-3.5.0/lapacke/src/Makefile.tmglib lapack-3.5.0/lapacke/src/Makef ../../$(LAPACKELIB): $(ALLOBJ) $(ALLXOBJ) - $(ARCH) $(ARCHFLAGS) ../../$(LAPACKELIB) $(ALLOBJ) $(ALLXOBJ) -+ $(ARCH) $(ARCHFLAGS) ../../$(LAPACKELIB) $(ALLOBJ) $(ALLXOBJ) ../../$(TMGLIB) ++ $(ARCH) $(ARCHFLAGS) ../../$(LAPACKELIB) $(ALLOBJ) $(ALLXOBJ) ../../TESTING/MATGEN/*.o $(RANLIB) ../../$(LAPACKELIB) .c.o: diff --git a/lapack.spec b/lapack.spec index fceb56e..5197cc1 100644 --- a/lapack.spec +++ b/lapack.spec @@ -10,7 +10,7 @@ Summary: Numerical linear algebra package libraries Name: lapack Version: %{mediumver}.0 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.netlib.org/lapack/ @@ -448,6 +448,9 @@ ln -sf libblas64.so.%{version} libblas64.so.%{mediumver} %endif %changelog +* Thu Jun 19 2014 Tom Callaway - 3.5.0-6 +- compile in tmglib object files, not static lib + * Wed Jun 18 2014 Tom Callaway - 3.5.0-5 - link tmglib into lapacke