[arch-commits] Commit in suitesparse/trunk (PKGBUILD suitesparse-math.patch)

Ronald van Haren ronald at archlinux.org
Thu Nov 6 11:44:30 UTC 2014


    Date: Thursday, November 6, 2014 @ 12:44:30
  Author: ronald
Revision: 225665

upgpkg: suitesparse 4.4.1-1

update to 4.4.1

Modified:
  suitesparse/trunk/PKGBUILD
Deleted:
  suitesparse/trunk/suitesparse-math.patch

------------------------+
 PKGBUILD               |   63 ++++++++++++++++++++++++-----------------------
 suitesparse-math.patch |   22 ----------------
 2 files changed, 33 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-06 08:59:12 UTC (rev 225664)
+++ PKGBUILD	2014-11-06 11:44:30 UTC (rev 225665)
@@ -2,8 +2,8 @@
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=suitesparse
-pkgver=4.3.1
-pkgrel=2
+pkgver=4.4.1
+pkgrel=1
 pkgdesc="A collection of sparse matrix libraries"
 url="http://www.cise.ufl.edu/research/sparse/SuiteSparse/"
 arch=('i686' 'x86_64')
@@ -14,14 +14,16 @@
 makedepends=('gcc-fortran')
 license=('GPL')
 options=('staticlibs')
-source=(http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-$pkgver.tar.gz http://pkgs.fedoraproject.org/cgit/suitesparse.git/plain/suitesparse-math.patch)
-sha1sums=('f7087d6178331d570c1ec811bbd17cbce70ce2f5'
+source=(http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-$pkgver.tar.gz http://pkgs.fedoraproject.org/cgit/suitesparse.git/plain/suitesparse-math.patch)
+sha1sums=('c8fa39b117b3121839deddbd0e56bf366c8130de'
           'a6b3f29df0cc813be0aa7afb65592c2eb431bba4')
 
+prepare() {
+   export CFLAGS=" ${CFLAGS} -DNPARTITION -fPIC"
+}
+
 build() {
    cd "$srcdir"/SuiteSparse
-   export CFLAGS=" ${CFLAGS} -DNPARTITION -fPIC"
-   patch -Np1 -i "$srcdir"/suitesparse-math.patch
    
    make -C SuiteSparse_config/xerbla
    make -C SuiteSparse_config 
@@ -29,46 +31,47 @@
       make -C ${_lib} library
    done
    mkdir shared
+   # version numbers can be found in individual changelog files
    ld -shared -soname libsuitesparseconfig.so.4 -o \
-      shared/libsuitesparseconfig.so.4.3.1 --whole-archive \
+      shared/libsuitesparseconfig.so.4.4.1 --whole-archive \
       SuiteSparse_config/libsuitesparseconfig.a -lm && \
-      ln -sf libsuitesparseconfig.so.4.3.1 shared/libsuitesparseconfig.so
-   ld -shared -soname libamd.so.2 -o shared/libamd.so.2.4.0 \
+      ln -sf libsuitesparseconfig.so.4.4.1 shared/libsuitesparseconfig.so
+   ld -shared -soname libamd.so.2 -o shared/libamd.so.2.4.1 \
       --whole-archive AMD/Lib/libamd.a -L./shared -lsuitesparseconfig -lm && \
-      ln -sf libamd.so.2.4.0 shared/libamd.so
-   ld -shared -soname libcamd.so.2 -o shared/libcamd.so.2.4.0 \
+      ln -sf libamd.so.2.4.1 shared/libamd.so
+   ld -shared -soname libcamd.so.2 -o shared/libcamd.so.2.4.1 \
       --whole-archive CAMD/Lib/libcamd.a -L./shared -lsuitesparseconfig -lm && \
-      ln -sf libcamd.so.2.4.0 shared/libcamd.so
-   ld -shared -soname libcolamd.so.2 -o shared/libcolamd.so.2.9.0 \
+      ln -sf libcamd.so.2.4.1 shared/libcamd.so
+   ld -shared -soname libcolamd.so.2 -o shared/libcolamd.so.2.9.1 \
       --whole-archive COLAMD/Lib/libcolamd.a -L./shared -lsuitesparseconfig -lm \
-      && ln -sf libcolamd.so.2.9.0 shared/libcolamd.so
-   ld -shared -soname libccolamd.so.2 -o shared/libccolamd.so.2.9.0 \
+      && ln -sf libcolamd.so.2.9.1 shared/libcolamd.so
+   ld -shared -soname libccolamd.so.2 -o shared/libccolamd.so.2.9.1 \
       --whole-archive CCOLAMD/Lib/libccolamd.a -L./shared -lsuitesparseconfig -lm \
-      && ln -sf libccolamd.so.2.9.0 shared/libccolamd.so
-   ld -shared -soname libbtf.so.1 -o shared/libbtf.so.1.2.0 \
+      && ln -sf libccolamd.so.2.9.1 shared/libccolamd.so
+   ld -shared -soname libbtf.so.1 -o shared/libbtf.so.1.2.1 \
       --whole-archive BTF/Lib/libbtf.a && \
-      ln -sf libbtf.so.1.2.0 shared/libbtf.so
-   ld -shared -soname libldl.so.2 -o shared/libldl.so.2.2.0 \
+      ln -sf libbtf.so.1.2.1 shared/libbtf.so
+   ld -shared -soname libldl.so.2 -o shared/libldl.so.2.2.1 \
       --whole-archive LDL/Lib/libldl.a && \
-      ln -sf libldl.so.2.2.0 shared/libldl.so
-   ld -shared -soname libcholmod.so.3 -o shared/libcholmod.so.3.0.1 \
+      ln -sf libldl.so.2.2.1 shared/libldl.so
+   ld -shared -soname libcholmod.so.3 -o shared/libcholmod.so.3.0.3 \
       --whole-archive CHOLMOD/Lib/libcholmod.a -lblas -llapack \
       -L./shared -lamd -lcamd -lcolamd -lccolamd -lsuitesparseconfig -lm && \
-      ln -sf libcholmod.so.3.0.1 shared/libcholmod.so
-   ld -shared -soname libspqr.so.1 -o shared/libspqr.so.1.3.3 \
+      ln -sf libcholmod.so.3.0.3 shared/libcholmod.so
+   ld -shared -soname libspqr.so.2 -o shared/libspqr.so.2.0.0 \
       --whole-archive SPQR/Lib/libspqr.a -lblas -llapack \
       -L./shared -lcholmod -lsuitesparseconfig -lm && \
-      ln -sf libspqr.so.1.3.3 shared/libspqr.so
-   ld -shared -soname libcxsparse.so.3 -o shared/libcxsparse.so.3.1.3 \
+      ln -sf libspqr.so.2.0.0 shared/libspqr.so
+   ld -shared -soname libcxsparse.so.3 -o shared/libcxsparse.so.3.1.4 \
       --whole-archive CXSparse/Lib/libcxsparse.a && \
-      ln -sf libcxsparse.so.3.1.3 shared/libcxsparse.so
-   ld -shared -soname libklu.so.1 -o shared/libklu.so.1.3.0 \
+      ln -sf libcxsparse.so.3.1.4 shared/libcxsparse.so
+   ld -shared -soname libklu.so.1 -o shared/libklu.so.1.3.2 \
       --whole-archive KLU/Lib/libklu.a -L./shared -lamd -lbtf \
-      -lsuitesparseconfig -lm && ln -sf libklu.so.1.3.0 shared/libklu.so
-   ld -shared -soname libumfpack.so.5 -o shared/libumfpack.so.5.7.0 \
+      -lsuitesparseconfig -lm && ln -sf libklu.so.1.3.2 shared/libklu.so
+   ld -shared -soname libumfpack.so.5 -o shared/libumfpack.so.5.7.1 \
       --whole-archive UMFPACK/Lib/libumfpack.a -lblas -llapack -L./shared \
       -lamd -lcholmod -lsuitesparseconfig -lm && \
-      ln -sf libumfpack.so.5.7.0 shared/libumfpack.so
+      ln -sf libumfpack.so.5.7.1 shared/libumfpack.so
 }
 
 

Deleted: suitesparse-math.patch
===================================================================
--- suitesparse-math.patch	2014-11-06 08:59:12 UTC (rev 225664)
+++ suitesparse-math.patch	2014-11-06 11:44:30 UTC (rev 225665)
@@ -1,22 +0,0 @@
-diff -up SuiteSparse/SuiteSparse_config/SuiteSparse_config.c.math SuiteSparse/SuiteSparse_config/SuiteSparse_config.c
---- SuiteSparse/SuiteSparse_config/SuiteSparse_config.c.math	2014-03-21 13:15:22.000000000 -0600
-+++ SuiteSparse/SuiteSparse_config/SuiteSparse_config.c	2014-09-15 16:53:50.243297000 -0600
-@@ -9,6 +9,7 @@
-  * Author: Timothy A. Davis.
-  */
- 
-+#include <math.h>
- #include <stdlib.h>
- 
- #ifndef NPRINT
-diff -up SuiteSparse/SuiteSparse_config/SuiteSparse_config.h.math SuiteSparse/SuiteSparse_config/SuiteSparse_config.h
---- SuiteSparse/SuiteSparse_config/SuiteSparse_config.h.math	2014-07-16 15:35:20.000000000 -0600
-+++ SuiteSparse/SuiteSparse_config/SuiteSparse_config.h	2014-09-15 16:23:31.802267503 -0600
-@@ -44,7 +44,6 @@ extern "C" {
- 
- #include <limits.h>
- #include <stdlib.h>
--#include <math.h>
- 
- /* ========================================================================== */
- /* === SuiteSparse_long ===================================================== */


More information about the arch-commits mailing list