From dc80a11b09a44adfd0ca668e1699b3f02086ab8a Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 22 Apr 2016 18:48:50 +0200 Subject: [PATCH] - updated to 5.2.0 (note: soname is now libsuperlu.so.5, following upstream) - updated shared patch --- SuperLU-shared.patch | 83 ++++---------------------------------------- SuperLU.spec | 9 ++--- 2 files changed, 11 insertions(+), 81 deletions(-) diff --git a/SuperLU-shared.patch b/SuperLU-shared.patch index cb92d2b..6bf87a6 100644 --- a/SuperLU-shared.patch +++ b/SuperLU-shared.patch @@ -1,70 +1,3 @@ ---- SuperLU_4.3/SRC/Makefile.orig 2011-10-27 21:49:47.000000000 +0200 -+++ SuperLU_4.3/SRC/Makefile 2015-05-28 18:50:54.792861306 +0200 -@@ -111,7 +111,19 @@ - ilu_zcolumn_dfs.o ilu_zpanel_dfs.o ilu_zcopy_to_ucol.o \ - ilu_zpivotL.o zdiagonal.o - --all: single double complex complex16 -+ALL_SRC = \ -+ $(SLUSRC) $(SLASRC) $(SCLAUX) \ -+ $(DLUSRC) $(DLASRC) $(DZLAUX) \ -+ $(CLUSRC) $(CLASRC) \ -+ $(ZLUSRC) $(ZLASRC) \ -+ $(ALLAUX) $(LAAUX) -+ -+ALL_LO = $(ALL_SRC:.o=.lo) -+ -+all: $(SUPERLULIB) -+ -+$(SUPERLULIB): $(ALL_LO) -+ libtool --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -o $(SUPERLULIB) $(ALL_LO) $(BLASLIB) -lm -rpath $(libdir) - - single: $(SLUSRC) $(ALLAUX) $(LAAUX) $(SLASRC) $(SCLAUX) - $(ARCH) $(ARCHFLAGS) $(SUPERLULIB) \ -@@ -140,13 +152,22 @@ - slamch.o: slamch.c ; $(CC) -c $(NOOPTS) $(CDEFS) $< - dlamch.o: dlamch.c ; $(CC) -c $(NOOPTS) $(CDEFS) $< - superlu_timer.o: superlu_timer.c ; $(CC) -c $(NOOPTS) $< -+slamch.lo: slamch.c ; $(LIBTOOL) --mode=compile $(CC) -c $(NOOPTS) $(CDEFS) $< -+dlamch.lo: dlamch.c ; $(LIBTOOL) --mode=compile $(CC) -c $(NOOPTS) $(CDEFS) $< -+superlu_timer.lo: superlu_timer.c ; $(LIBTOOL) --mode=compile $(CC) -c $(NOOPTS) $< - ################################## - - .c.o: - $(CC) $(CFLAGS) $(CDEFS) $(BLASDEF) -c $< $(VERBOSE) - -+%.lo: %.c -+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CDEFS) $(BLASDEF) -c $< $(VERBOSE) -+ - .f.o: - $(FORTRAN) $(FFLAGS) -c $< - -+%.lo: %.f -+ $(LIBTOOL) --mode=compile $(FORTRAN) $(FFLAGS) -c $< -+ - clean: - rm -f *.o $(SUPERLULIB) ---- SuperLU_5.1.1/make.inc.orig 2016-03-16 18:10:52.643365074 +0100 -+++ SuperLU_5.1.1/make.inc 2016-03-16 18:14:17.830023131 +0100 -@@ -15,8 +15,8 @@ - # - # The name of the libraries to be created/linked to - # --SuperLUroot = /home/xiaoye/Dropbox/Codes/SuperLU/SuperLU_5.1.1/build --SUPERLULIB = $(SuperLUroot)/SRC/libsuperlu_5.1.1.a -+SuperLUroot = . -+SUPERLULIB = $(SuperLUroot)/SRC/libsuperlu.la - - TMGLIB = libtmglib.a - ## BLASLIB = $(SuperLUroot)/lib/libblas.a -@@ -32,6 +32,7 @@ - ARCH = /usr/bin/ar - ARCHFLAGS = cr - RANLIB = /usr/bin/ranlib -+LIBTOOL = libtool - - CC = /usr/bin/cc - CFLAGS = -O3 -DPRNTlevel=0 -DAdd_ --- SuperLU_5.5.1/TESTING/MATGEN/CMakeLists.txt.orig 2015-12-04 02:06:38.000000000 +0100 +++ SuperLU_5.5.1/TESTING/MATGEN/CMakeLists.txt 2016-03-16 17:43:13.950101349 +0100 @@ -104,4 +104,4 @@ @@ -73,16 +6,12 @@ -add_library(matgen ${sources}) +add_library(matgen STATIC ${sources}) ---- SuperLU_5.1.1/SRC/CMakeLists.txt.orig 2016-01-22 05:34:21.000000000 +0100 -+++ SuperLU_5.1.1/SRC/CMakeLists.txt 2016-03-16 18:17:37.826681402 +0100 -@@ -227,12 +227,14 @@ - endif() - - add_library(superlu_${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BugFix} ${sources} ${HEADERS}) -+set_target_properties(superlu_${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BugFix} PROPERTIES OUTPUT_NAME superlu VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BugFix} SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR}) -+target_link_libraries(superlu_${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BugFix} ${BLAS_LIB} m) - - install(TARGETS superlu_${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BugFix} +--- SuperLU_5.2.0/SRC/CMakeLists.txt.orig 2016-04-21 21:59:21.051327176 +0200 ++++ SuperLU_5.2.0/SRC/CMakeLists.txt 2016-04-21 22:07:43.064639436 +0200 +@@ -233,9 +233,9 @@ + VERSION ${PROJECT_VERSION} SOVERSION ${VERSION_MAJOR} + ) + install(TARGETS superlu - DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} ) diff --git a/SuperLU.spec b/SuperLU.spec index c279998..2b516c3 100644 --- a/SuperLU.spec +++ b/SuperLU.spec @@ -1,12 +1,12 @@ Summary: Subroutines to solve a sparse linear system A*X=B Summary(pl.UTF-8): Procedury do rozwiązywania rzadkich układów równań liniowych A*X=B Name: SuperLU -Version: 5.1.1 +Version: 5.2.0 Release: 1 License: BSD Group: Libraries Source0: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_%{version}.tar.gz -# Source0-md5: 260a3cd90b2100122abff38587a8290a +# Source0-md5: ba3cfc93a93a8caed90bcf6f9b804ac7 Patch0: %{name}-shared.patch URL: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/ BuildRequires: blas-devel @@ -63,7 +63,8 @@ Dokumentacja API biblioteki SuperLU. %build install -d build cd build -%cmake .. +%cmake .. \ + -Denable_blaslib=OFF %{__make} @@ -83,7 +84,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc README %attr(755,root,root) %{_libdir}/libsuperlu.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libsuperlu.so.5.1 +%attr(755,root,root) %ghost %{_libdir}/libsuperlu.so.5 %files devel %defattr(644,root,root,755) -- 2.43.0