fix lapacke static lib

This commit is contained in:
Tom Callaway 2015-12-03 14:31:39 -05:00
parent 752b77610c
commit 19835bb0c3
2 changed files with 20 additions and 6 deletions

View File

@ -1,19 +1,30 @@
diff -up lapack-3.6.0/LAPACKE/Makefile.tmglib lapack-3.6.0/LAPACKE/Makefile diff -up lapack-3.6.0/LAPACKE/Makefile.tmglib lapack-3.6.0/LAPACKE/Makefile
--- lapack-3.6.0/LAPACKE/Makefile.tmglib 2015-11-17 11:31:40.157805921 -0500 --- lapack-3.6.0/LAPACKE/Makefile.tmglib 2015-12-02 10:01:15.639679177 -0500
+++ lapack-3.6.0/LAPACKE/Makefile 2015-11-17 11:31:40.160805897 -0500 +++ lapack-3.6.0/LAPACKE/Makefile 2015-12-02 10:01:15.660679035 -0500
@@ -50,7 +50,7 @@ lapacke: @@ -50,7 +50,7 @@ lapacke:
cd utils && $(MAKE) cd utils && $(MAKE)
shlib: lapacke 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
+ $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHLIB_LAPACKE).@SHORTVER@ -o $(SHLIB_LAPACKE).@LONGVER@ src/*.o utils/*.o $(LIBS) -lgfortran -lc ../TESTING/MATGEN/*.o + $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHLIB_LAPACKE).3 -o $(SHLIB_LAPACKE).3.6.0 src/*.o utils/*.o $(LIBS) -lgfortran -lc ../TESTING/MATGEN/*.o
lapacke_example: lapacke_example:
cd example && $(MAKE) cd example && $(MAKE)
diff -up lapack-3.6.0/LAPACKE/src/Makefile.tmglib lapack-3.6.0/LAPACKE/src/Makefile diff -up lapack-3.6.0/LAPACKE/src/Makefile.tmglib lapack-3.6.0/LAPACKE/src/Makefile
--- lapack-3.6.0/LAPACKE/src/Makefile.tmglib 2015-12-03 12:18:04.216900463 -0500
+++ lapack-3.6.0/LAPACKE/src/Makefile 2015-12-03 12:18:15.638838677 -0500
@@ -2204,7 +2204,7 @@ OBJ_FILES := $(C_FILES:.o=.o)
all: ../../$(LAPACKELIB)
../../$(LAPACKELIB): $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED)
- $(ARCH) $(ARCHFLAGS) ../../$(LAPACKELIB) $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED)
+ $(ARCH) $(ARCHFLAGS) ../../$(LAPACKELIB) $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED) ../../TESTING/MATGEN/*.o
$(RANLIB) ../../$(LAPACKELIB)
.c.o:
diff -up lapack-3.6.0/Makefile.tmglib lapack-3.6.0/Makefile diff -up lapack-3.6.0/Makefile.tmglib lapack-3.6.0/Makefile
--- lapack-3.6.0/Makefile.tmglib 2015-11-17 11:31:40.161805889 -0500 --- lapack-3.6.0/Makefile.tmglib 2015-11-01 11:21:47.000000000 -0500
+++ lapack-3.6.0/Makefile 2015-11-17 11:35:15.995097283 -0500 +++ lapack-3.6.0/Makefile 2015-12-02 10:01:15.647679123 -0500
@@ -26,7 +26,7 @@ cblaslib: @@ -26,7 +26,7 @@ cblaslib:
lapacklib: lapack_install lapacklib: lapack_install
( cd SRC; $(MAKE) ) ( cd SRC; $(MAKE) )

View File

@ -10,7 +10,7 @@
Summary: Numerical linear algebra package libraries Summary: Numerical linear algebra package libraries
Name: lapack Name: lapack
Version: %{mediumver}.0 Version: %{mediumver}.0
Release: 4%{?dist} Release: 5%{?dist}
License: BSD License: BSD
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.netlib.org/lapack/ URL: http://www.netlib.org/lapack/
@ -458,6 +458,9 @@ ln -sf libblas64.so.%{version} libblas64.so.%{mediumver}
%endif %endif
%changelog %changelog
* Thu Dec 3 2015 Tom Callaway <spot@fedoraproject.org> - 3.6.0-5
- fix lapache static lib to include TMGLIB bits
* Wed Dec 2 2015 Tom Callaway <spot@fedoraproject.org> - 3.6.0-4 * Wed Dec 2 2015 Tom Callaway <spot@fedoraproject.org> - 3.6.0-4
- build deprecated functions for lapacke (RHBZ #1287405) - build deprecated functions for lapacke (RHBZ #1287405)