Hello community,
here is the log from the commit of package suitesparse for openSUSE:Factory
checked in at 2014-06-25 15:24:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suitesparse (Old)
and /work/SRC/openSUSE:Factory/.suitesparse.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suitesparse"
Changes:
--------
--- /work/SRC/openSUSE:Factory/suitesparse/suitesparse.changes 2013-11-12
11:41:55.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.suitesparse.new/suitesparse.changes
2014-06-25 15:24:13.000000000 +0200
@@ -1,0 +2,5 @@
+Sun Jun 22 06:49:20 UTC 2014 - dmitr...@opensuse.org
+
+- Fix libraries linking [bnc#883683]
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suitesparse.spec ++++++
--- /var/tmp/diff_new_pack.CBeRtt/_old 2014-06-25 15:24:14.000000000 +0200
+++ /var/tmp/diff_new_pack.CBeRtt/_new 2014-06-25 15:24:14.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package suitesparse
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -435,17 +435,37 @@
%patch775418 -p1
%build
-for dir in AMD BTF CAMD CCOLAMD CHOLMOD COLAMD CSparse CXSparse KLU LDL RBio
SPQR UMFPACK; do
+mkdir -p Lib
+
+#bnc775418 provides SuiteSparse_time symbol in SuiteSparse_config
+pushd SuiteSparse_config
+ make CFLAGS="%{optflags} -fPIC"
+ pushd ../Lib
+ gcc -shared -Wl,-soname -Wl,"libsuitesparseconfig-%{configver}.so" -o
"libsuitesparseconfig-%{configver}.so" ../SuiteSparse_config/*.o -lm
+ ln -s "libsuitesparseconfig-%{version}.so" "libsuitesparseconfig.so"
+ popd
+popd
+
+# libraries linking config [bnc#883683]
+cholmod_libs="libamd.so libcamd.so libcolamd.so libccolamd.so
libsuitesparseconfig.so -lblas -llapack"
+klu_libs="libamd.so libbtf.so libcolamd.so"
+rbio_libs="libsuitesparseconfig.so"
+spqr_libs="libcholmod.so libsuitesparseconfig.so -lblas -llapack"
+umfpack_libs="libamd.so libcholmod.so libsuitesparseconfig.so -lblas -llapack"
+
+for dir in AMD BTF CAMD CCOLAMD COLAMD CHOLMOD CSparse CXSparse KLU LDL RBio
SPQR UMFPACK; do
pushd $dir
ver=$(grep -E "^VERSION =" Makefile | sed "s:VERSION = ::")
- pushd Lib
make CFLAGS="%{optflags} -fPIC"
+ popd
+ pushd Lib
dir_l=$(echo "$dir" | tr "[A-Z]" "[a-z]")
- gcc -shared -Wl,-soname -Wl,"lib${dir_l}-$ver.so" -o
"lib${dir_l}-$ver.so" *.o -lm
+ linked_libs=${dir_l}_libs
+ gcc -shared -Wl,-soname -Wl,"lib${dir_l}-$ver.so" -o
"lib${dir_l}-$ver.so" ../${dir}/Lib/*.o ${!linked_libs} -lm
ln -s "lib${dir_l}-$ver.so" "lib${dir_l}.so"
popd
- popd
done
+
# specialities
# -- CHOLMOD
pushd CHOLMOD
@@ -456,13 +476,6 @@
cp Supernodal/License.txt Doc/Supernodal_License.txt
popd
-#bnc775418 provides SuiteSparse_time symbol in SuiteSparse_config
-pushd SuiteSparse_config
- make CFLAGS="%{optflags} -fPIC"
- gcc -shared -Wl,-soname -Wl,"libsuitesparseconfig-%{configver}.so" -o
"libsuitesparseconfig-%{configver}.so" *.o -lm
- ln -s "libsuitesparseconfig-%{version}.so" "libsuitesparseconfig.so"
-popd
-
%install
mkdir -p %{buildroot}%{_includedir}/%{name}
mkdir -p %{buildroot}%{_libdir}
@@ -470,10 +483,11 @@
mkdir -p %{buildroot}%{_docdir}/%{name}-devel
cp -a SuiteSparse_config/SuiteSparse_config.h
%{buildroot}%{_includedir}/%{name}
cp -a README.txt %{buildroot}%{_docdir}/%{name}
+cp -a Lib/*.so* %{buildroot}/%{_libdir}
for dir in AMD BTF CAMD CCOLAMD CHOLMOD COLAMD CSparse CXSparse KLU LDL RBio
SPQR UMFPACK; do
pushd $dir
ver=$(grep -E "^VERSION =" Makefile | sed "s:VERSION = ::")
- cp -a Lib/*.a Lib/*.so* %{buildroot}/%{_libdir}
+ cp -a Lib/*.a %{buildroot}/%{_libdir}
cp -a Include/*.h %{buildroot}%{_includedir}/%{name}
mkdir %{buildroot}%{_docdir}/%{name}/$dir-$ver
mkdir %{buildroot}%{_docdir}/%{name}-devel/$dir
@@ -482,7 +496,7 @@
popd
done
-cp -r SuiteSparse_config/*.so* SuiteSparse_config/*.a %{buildroot}%{_libdir}
+cp -r SuiteSparse_config/*.a %{buildroot}%{_libdir}
mkdir %{buildroot}%{_docdir}/%{name}/SuiteSparse_config-%{configver}/
cp -r SuiteSparse_config/README.txt
%{buildroot}%{_docdir}/%{name}/SuiteSparse_config-%{configver}/
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
