lapacke + tmglib

This commit is contained in:
Tom Callaway 2014-06-18 17:22:59 -04:00
parent 371896bc84
commit 09640809c5
2 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,36 @@
diff -up lapack-3.5.0/lapacke/Makefile.tmglib lapack-3.5.0/lapacke/Makefile
--- lapack-3.5.0/lapacke/Makefile.tmglib 2014-06-18 14:21:50.057725467 -0400
+++ lapack-3.5.0/lapacke/Makefile 2014-06-18 14:22:29.360436295 -0400
@@ -50,7 +50,7 @@ lapacke:
cd utils && $(MAKE)
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)
lapacke_example:
cd example && $(MAKE)
diff -up lapack-3.5.0/lapacke/src/Makefile.tmglib lapack-3.5.0/lapacke/src/Makefile
--- lapack-3.5.0/lapacke/src/Makefile.tmglib 2014-06-18 14:21:50.056725474 -0400
+++ lapack-3.5.0/lapacke/src/Makefile 2014-06-18 14:21:50.057725467 -0400
@@ -2073,7 +2073,7 @@ OBJ_FILES := $(C_FILES:.o=.o)
all: ../../$(LAPACKELIB)
../../$(LAPACKELIB): $(ALLOBJ) $(ALLXOBJ)
- $(ARCH) $(ARCHFLAGS) ../../$(LAPACKELIB) $(ALLOBJ) $(ALLXOBJ)
+ $(ARCH) $(ARCHFLAGS) ../../$(LAPACKELIB) $(ALLOBJ) $(ALLXOBJ) ../../$(TMGLIB)
$(RANLIB) ../../$(LAPACKELIB)
.c.o:
diff -up lapack-3.5.0/Makefile.tmglib lapack-3.5.0/Makefile
--- lapack-3.5.0/Makefile.tmglib 2012-04-13 14:22:32.000000000 -0400
+++ lapack-3.5.0/Makefile 2014-06-18 14:21:50.058725460 -0400
@@ -23,7 +23,7 @@ blaslib:
lapacklib: lapack_install
( cd SRC; $(MAKE) )
-lapackelib: lapacklib
+lapackelib: tmglib lapacklib
( cd lapacke; $(MAKE) )
lapacke_example: lapackelib

View File

@ -10,7 +10,7 @@
Summary: Numerical linear algebra package libraries
Name: lapack
Version: %{mediumver}.0
Release: 4%{?dist}
Release: 5%{?dist}
License: BSD
Group: System Environment/Libraries
URL: http://www.netlib.org/lapack/
@ -24,6 +24,7 @@ Patch3: lapack-3.4.0-make.inc.patch
Patch4: lapack-3.4.1-lapacke-shared.patch
Patch5: lapack-3.4.1-lapacke-disable-testing-functions.patch
Patch6: lapack-3.5.0-lapacke-matgenobj.patch
Patch7: lapack-3.5.0-lapacke-tmglib.patch
BuildRequires: gcc-gfortran
%description
@ -151,6 +152,7 @@ BLAS static libraries (64bit INTEGER).
%patch4 -p1 -b .shared
%patch5 -p1 -b .disable-functions
%patch6 -p1 -b .matgenobj
%patch7 -p1 -b .tmglib
mkdir manpages
mv man/ manpages/
@ -284,6 +286,7 @@ ln -s liblapack64.so.%{version} liblapack64.so
%endif
# Build the lapacke libraries
make OPTS="$RPM_OPT_FLAGS -fPIC" tmglib
pushd lapacke
make clean
make CFLAGS="$RPM_OPT_FLAGS" lapacke
@ -445,6 +448,9 @@ ln -sf libblas64.so.%{version} libblas64.so.%{mediumver}
%endif
%changelog
* Wed Jun 18 2014 Tom Callaway <spot@fedoraproject.org> - 3.5.0-5
- link tmglib into lapacke
* Tue Jun 17 2014 Tom Callaway <spot@fedoraproject.org> - 3.5.0-4
- include matgen_obj items in lapacke library