libraries/CXSparse: Updated for version 2.2.5.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

3 files changed, 50 insertions, 15 deletions

diff --git a/libraries/CXSparse/CXSparse.SlackBuild b/libraries/CXSparse/CXSparse.SlackBuild
index 0395eecec5..65b4fd8f58 100644
--- a/libraries/CXSparse/CXSparse.SlackBuild
+++ b/libraries/CXSparse/CXSparse.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Kyle Guinn <elyk03@gmail.com>
 
 PRGNAM=CXSparse
-VERSION=${VERSION:-2.2.4}
+VERSION=${VERSION:-2.2.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -37,6 +37,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Recommended by SuiteSparse
+SLKCFLAGS="$SLKCFLAGS -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
+
 set -e
 
 rm -rf $PKG
@@ -52,14 +55,16 @@ patch -p1 < $CWD/autotoolize.diff
 autoreconf -vif
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-shared \
+  --disable-static \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/libraries/CXSparse/CXSparse.info b/libraries/CXSparse/CXSparse.info
index fb8815a558..71e96aa5a1 100644
--- a/libraries/CXSparse/CXSparse.info
+++ b/libraries/CXSparse/CXSparse.info
@@ -1,8 +1,8 @@
 PRGNAM="CXSparse"
-VERSION="2.2.4"
+VERSION="2.2.5"
 HOMEPAGE="http://www.cise.ufl.edu/research/sparse/CXSparse/"
-DOWNLOAD="http://www.cise.ufl.edu/research/sparse/CXSparse/versions/CXSparse-2.2.4.tar.gz"
-MD5SUM="043286037931a96b379b40bf89e44317"
+DOWNLOAD="http://www.cise.ufl.edu/research/sparse/CXSparse/versions/CXSparse-2.2.5.tar.gz"
+MD5SUM="03750f3501fb3ccb7f2518bd24c4abbc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Kyle Guinn"
diff --git a/libraries/CXSparse/autotoolize.diff b/libraries/CXSparse/autotoolize.diff
index 9588bae1ef..151b75a9ae 100644
--- a/libraries/CXSparse/autotoolize.diff
+++ b/libraries/CXSparse/autotoolize.diff
@@ -3,7 +3,7 @@ new file mode 100644
 --- /dev/null
 +++ b/Demo/Makefile.am
 @@ -0,0 +1,131 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Include
++AM_CPPFLAGS = -I$(top_srcdir)/Include $(UFCONFIG_CFLAGS)
 +LDADD = $(top_builddir)/Source/libcxsparse.la
 +
 +noinst_HEADERS = \
@@ -134,16 +134,23 @@ new file mode 100644
 +	-./cs_cl_demo3 < ../Matrix/mhd1280b
 +	-./cs_idemo < ../Matrix/t2
 +	-./cs_ldemo < ../Matrix/t2
+diff --git a/Include/Makefile.am b/Include/Makefile.am
+new file mode 100644
+--- /dev/null
++++ b/Include/Makefile.am
+@@ -0,0 +1,2 @@
++pkgincludedir = $(includedir)/cxsparse
++pkginclude_HEADERS = cs.h
 diff --git a/Makefile.am b/Makefile.am
 new file mode 100644
 --- /dev/null
 +++ b/Makefile.am
 @@ -0,0 +1,5 @@
-+SUBDIRS = Source Matrix Demo
++SUBDIRS = Include Source Matrix Demo
 +EXTRA_DIST = README.txt Doc/ChangeLog Doc/License.txt Doc/lesser.txt
 +
-+pkgincludedir = $(includedir)/cxsparse
-+pkginclude_HEADERS = Include/cs.h
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = cxsparse.pc
 diff --git a/Matrix/Makefile.am b/Matrix/Makefile.am
 new file mode 100644
 --- /dev/null
@@ -177,7 +184,7 @@ new file mode 100644
 --- /dev/null
 +++ b/Source/Makefile.am
 @@ -0,0 +1,72 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Include
++AM_CPPFLAGS = -I$(top_srcdir)/Include $(UFCONFIG_CFLAGS)
 +
 +CS_SOURCE = \
 +	cs_add.c \
@@ -248,14 +255,14 @@ new file mode 100644
 +
 +libcxsparse_la_SOURCES = cs_convert.c
 +libcxsparse_la_LIBADD = libcxsparse_di.la libcxsparse_dl.la libcxsparse_ci.la libcxsparse_cl.la -lm
-+libcxsparse_la_LDFLAGS = -no-undefined -version-info 4:4:2
++libcxsparse_la_LDFLAGS = -no-undefined -version-info 4:5:2
 diff --git a/configure.ac b/configure.ac
 new file mode 100644
 --- /dev/null
 +++ b/configure.ac
-@@ -0,0 +1,31 @@
-+AC_PREREQ([2.65])
-+AC_INIT([CXSparse], [2.2.4], [davis@cise.ufl.edu])
+@@ -0,0 +1,37 @@
++AC_PREREQ([2.68])
++AC_INIT([CXSparse],[2.2.5],[davis@cise.ufl.edu])
 +AC_CONFIG_SRCDIR([Source/cs_print.c])
 +AC_CONFIG_HEADER([config.h])
 +AM_INIT_AUTOMAKE([foreign])
@@ -269,7 +276,11 @@ new file mode 100644
 +AC_CHECK_LIB([m], [sqrt])
 +
 +AC_CHECK_HEADERS([limits.h stdlib.h])
-+AC_CHECK_HEADERS([UFconfig.h])
++
++PKG_PROG_PKG_CONFIG
++PKG_CHECK_MODULES([UFCONFIG],[ufconfig],
++	[],
++	[AC_MSG_ERROR([cannot find ufconfig])])
 +
 +AC_TYPE_SIZE_T
 +
@@ -280,8 +291,27 @@ new file mode 100644
 +LIBS=$LIBS_SAVED
 +
 +AC_CONFIG_FILES([
++	cxsparse.pc
 +	Makefile
 +	Demo/Makefile
++	Include/Makefile
 +	Matrix/Makefile
 +	Source/Makefile])
 +AC_OUTPUT
+diff --git a/cxsparse.pc.in b/cxsparse.pc.in
+new file mode 100644
+--- /dev/null
++++ b/cxsparse.pc.in
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: @PACKAGE_NAME@
++Description: An extended version of CSparse
++Version: @PACKAGE_VERSION@
++Requires.private: ufconfig
++Libs: -L${libdir} -lcxsparse
++Libs.private: -lm
++Cflags: -I${includedir}/cxsparse