[packages/SuperLU] - updated to 5.1.1 (note: interface incompatibilities, so new soname) - updated shared patch - build
qboosh
qboosh at pld-linux.org
Wed Mar 16 21:28:47 CET 2016
commit 3bb9c8d64ef256111ac4d1d875371305fb3d589e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Mar 16 21:32:49 2016 +0100
- updated to 5.1.1 (note: interface incompatibilities, so new soname)
- updated shared patch
- build using cmake; -static is gone
SuperLU-format.patch | 11 -----------
SuperLU-shared.patch | 52 ++++++++++++++++++++++++++++++++++++++++------------
SuperLU.spec | 50 +++++++++++++++-----------------------------------
3 files changed, 55 insertions(+), 58 deletions(-)
---
diff --git a/SuperLU.spec b/SuperLU.spec
index 596e8bf..c279998 100644
--- a/SuperLU.spec
+++ b/SuperLU.spec
@@ -1,16 +1,17 @@
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: 4.3
-Release: 3
+Version: 5.1.1
+Release: 1
License: BSD
Group: Libraries
Source0: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_%{version}.tar.gz
-# Source0-md5: b72c6309f25e9660133007b82621ba7c
-Patch0: %{name}-format.patch
-Patch1: %{name}-shared.patch
+# Source0-md5: 260a3cd90b2100122abff38587a8290a
+Patch0: %{name}-shared.patch
URL: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/
BuildRequires: blas-devel
+BuildRequires: cmake >= 2.8.12
+BuildRequires: gcc-fortran
BuildRequires: libtool >= 2:1.5
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -33,6 +34,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe biblioteki SuperLU
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: blas-devel
+Obsoletes: SuperLU-static
%description devel
Header files for SuperLU library.
@@ -40,18 +42,6 @@ Header files for SuperLU library.
%description devel -l pl.UTF-8
Pliki nagłówkowe biblioteki SuperLU.
-%package static
-Summary: Static SuperLU library
-Summary(pl.UTF-8): Statyczna biblioteka SuperLU
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-
-%description static
-Static SuperLU library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka SuperLU.
-
%package apidocs
Summary: SuperLU API documentation
Summary(pl.UTF-8): Dokumentacja API biblioteki SuperLU
@@ -69,24 +59,19 @@ Dokumentacja API biblioteki SuperLU.
%prep
%setup -q -n %{name}_%{version}
%patch0 -p1
-%patch1 -p1
%build
-%{__make} -C SRC \
- SuperLUroot=$(pwd) \
- BLASLIB="-lblas" \
- CC="%{__cc}" \
- CFLAGS="%{rpmcflags} -DPRNTlevel=0" \
- FFLAGS="%{rpmcflags}" \
- LDFLAGS="%{rpmldflags}" \
- libdir=%{_libdir}
+install -d build
+cd build
+%cmake ..
+
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/superlu}
-libtool --mode=install install lib/libsuperlu.la $RPM_BUILD_ROOT%{_libdir}
-cp -p SRC/slu_*.h SRC/super*.h $RPM_BUILD_ROOT%{_includedir}/superlu
+%{__make} -C build install \
+ DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@ -98,19 +83,14 @@ 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.0
+%attr(755,root,root) %ghost %{_libdir}/libsuperlu.so.5.1
%files devel
%defattr(644,root,root,755)
%doc DOC/ug.pdf
%attr(755,root,root) %{_libdir}/libsuperlu.so
-%{_libdir}/libsuperlu.la
%{_includedir}/superlu
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libsuperlu.a
-
%files apidocs
%defattr(644,root,root,755)
%doc DOC/html/*
diff --git a/SuperLU-format.patch b/SuperLU-format.patch
deleted file mode 100644
index 9bd353c..0000000
--- a/SuperLU-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- SuperLU_4.3/SRC/util.c.orig 2011-10-27 21:49:47.000000000 +0200
-+++ SuperLU_4.3/SRC/util.c 2015-05-22 23:11:04.981981786 +0200
-@@ -29,7 +29,7 @@
-
- void superlu_abort_and_exit(char* msg)
- {
-- fprintf(stderr, msg);
-+ fputs(msg, stderr);
- exit (-1);
- }
-
diff --git a/SuperLU-shared.patch b/SuperLU-shared.patch
index f77d99e..cb92d2b 100644
--- a/SuperLU-shared.patch
+++ b/SuperLU-shared.patch
@@ -44,22 +44,50 @@
+
clean:
rm -f *.o $(SUPERLULIB)
---- SuperLU_4.3/make.inc.orig 2011-12-12 23:34:18.000000000 +0100
-+++ SuperLU_4.3/make.inc 2015-05-28 18:50:53.759528016 +0200
-@@ -22,7 +22,7 @@
+--- 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)/Codes/SuperLU/SuperLU_4.3
--SUPERLULIB = $(SuperLUroot)/lib/libsuperlu_4.3.a
-+SUPERLULIB = $(SuperLUroot)/lib/libsuperlu.la
- TMGLIB = libtmglib.a
+-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
-@@ -44,6 +44,7 @@
- ARCH = ar
+@@ -32,6 +32,7 @@
+ ARCH = /usr/bin/ar
ARCHFLAGS = cr
- RANLIB = ranlib
+ RANLIB = /usr/bin/ranlib
+LIBTOOL = libtool
- CC = gcc
- CFLAGS = -DPRNTlevel=0 -O3
+ 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 @@
+ )
+ endif()
+
+-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}
+- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
+ )
+
+ install(FILES ${headers}
+- DESTINATION ${CMAKE_INSTALL_PREFIX}/include
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/superlu
+ )
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/SuperLU.git/commitdiff/3bb9c8d64ef256111ac4d1d875371305fb3d589e
More information about the pld-cvs-commit
mailing list