use compiled tmglib .o files, not static lib

This commit is contained in:
Tom Callaway 2014-06-19 18:07:15 -04:00
parent 09640809c5
commit 29005a029c
2 changed files with 6 additions and 3 deletions

View File

@ -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:

View File

@ -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 <spot@fedoraproject.org> - 3.5.0-6
- compile in tmglib object files, not static lib
* Wed Jun 18 2014 Tom Callaway <spot@fedoraproject.org> - 3.5.0-5
- link tmglib into lapacke