[Pkg-scicomp-commits] [SCM] suitesparse branch, master, updated. b76def459ea2d3845a675762bad7875cef0bd323

[Rafael Laboissiere]

tags 526422 pending
thanks

The following commit has been merged in the master branch:
commit 71c479758afda826929080499e51f0c8bb3a4868
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Fri May 8 20:29:29 2009 +0200

    Fix unresolved symbols issues detected by dpkg-shlibdeps
    
    Sprinkle some linking to KLU, UMFPACK shared libraries to not have
    unresolved symbols. Remove some from CHOLMOD. Now dpkg-shlibdeps does not
    warn anymore.  Thanks to Thomas Viehmann, this fixes Bug#526422.

diff --git a/debian/changelog b/debian/changelog
index 1239645..ac9bb57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 suitesparse (1:3.3.0-1) UNRELEASED; urgency=low
 
+  [ Rafael Laboissiere ]
   * New upstream release
   * debian/patches/14-SPQR_Include_spqr_hpp.dpatch: Removed patch (applied
     upstream)
@@ -9,6 +10,13 @@ suitesparse (1:3.3.0-1) UNRELEASED; urgency=low
       repository at alioth.debian.org.  Switch the Vcs-* URLs to Git,
       accordingly.
 
+  [ Thomas Viehmann ]
+  * Sprinkle some linking to KLU, UMFPACK shared libraries
+    to not have unresolved symbols. Remove some from CHOLMOD.
+    Now dpkg-shlibdeps does not warn anymore.
+    (changing debian/patches/*Makefile.dpatch)
+    Closes: #526422
+
  -- Rafael Laboissiere <rafael at debian.org>  Fri, 08 May 2009 15:45:21 +0200
 
 suitesparse (1:3.2.0-4) unstable; urgency=low
diff --git a/debian/patches/07-KLU_Lib_Makefile.dpatch b/debian/patches/07-KLU_Lib_Makefile.dpatch
index f523425..6b84930 100755
--- a/debian/patches/07-KLU_Lib_Makefile.dpatch
+++ b/debian/patches/07-KLU_Lib_Makefile.dpatch
@@ -55,7 +55,7 @@ diff -u upstrm/KLU/Lib/Makefile debsrc/KLU/Lib/Makefile
  
 -$(OBJ): $(INC)
 +libklu.so.3.2.0: $(OBJ_SL)
-+	$(CC) -shared $^ -lm -Wl,-soname -Wl,$@ -o $@
++	$(CC) -shared $^ -lm ../../AMD/Lib/libamd.so ../../BTF/Lib/libbtf.so ../../COLAMD/Lib/libcolamd.so -Wl,-soname -Wl,$@ -o $@
 +	ln -s $@ libklu.so
 +
 +$(OBJ) $(OBJ_SL): $(INC)
diff --git a/debian/patches/11-UMFPACK_Lib_GNUmakefile.dpatch b/debian/patches/11-UMFPACK_Lib_GNUmakefile.dpatch
index e0fe49f..e126d2f 100755
--- a/debian/patches/11-UMFPACK_Lib_GNUmakefile.dpatch
+++ b/debian/patches/11-UMFPACK_Lib_GNUmakefile.dpatch
@@ -291,7 +291,7 @@ diff -u upstrm/UMFPACK/Lib/GNUmakefile debsrc/UMFPACK/Lib/GNUmakefile
 +	- $(RANLIB) libumfpack.a
 +
 +libumfpack.so.3.2.0: $(II_SL) $(LL_SL) $(GN_SL) $(DI_SL) $(DL_SL) $(ZI_SL) $(ZL_SL)
-+	$(CC) -shared $^ -lm -Wl,-soname -Wl,$@ -o $@
++	$(CC) -shared $^ -lm -lblas ../../AMD/Lib/libamd.so -Wl,-soname -Wl,$@ -o $@
 +	ln -s $@ libumfpack.so
  
  #-------------------------------------------------------------------------------
diff --git a/debian/patches/12-CHOLMOD_Lib_Makefile.dpatch b/debian/patches/12-CHOLMOD_Lib_Makefile.dpatch
index 6f39527..4f80600 100755
--- a/debian/patches/12-CHOLMOD_Lib_Makefile.dpatch
+++ b/debian/patches/12-CHOLMOD_Lib_Makefile.dpatch
@@ -115,7 +115,7 @@ diff -u upstrm/CHOLMOD/Lib/Makefile debsrc/CHOLMOD/Lib/Makefile
  
 -$(OBJ): $(INC)
 +libcholmod.so.3.2.0: $(OBJ_SL)
-+	$(CC) -shared $^ -lblas -llapack ../../AMD/Lib/libamd.so ../../CAMD/Lib/libcamd.so ../../COLAMD/Lib/libcolamd.so ../../CCOLAMD/Lib/libccolamd.so -lm  -Wl,-soname -Wl,$@ -o $@
++	$(CC) -shared $^ -lblas -llapack ../../AMD/Lib/libamd.so ../../COLAMD/Lib/libcolamd.so -lm  -Wl,-soname -Wl,$@ -o $@
 +	ln -s $@ libcholmod.so
 +
 +$(OBJ) $(OBJ_SL): $(INC)

-- 
suitesparse