libraries/CCOLAMD: Updated for version 2.7.3.

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

3 files changed, 52 insertions, 15 deletions

diff --git a/libraries/CCOLAMD/CCOLAMD.SlackBuild b/libraries/CCOLAMD/CCOLAMD.SlackBuild
index 67daa6cdae7..2398e86602a 100644
--- a/libraries/CCOLAMD/CCOLAMD.SlackBuild
+++ b/libraries/CCOLAMD/CCOLAMD.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Kyle Guinn <elyk03@gmail.com>
 
 PRGNAM=CCOLAMD
-VERSION=${VERSION:-2.7.2}
+VERSION=${VERSION:-2.7.3}
 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/CCOLAMD/CCOLAMD.info b/libraries/CCOLAMD/CCOLAMD.info
index ce51d7c2437..df7a712f339 100644
--- a/libraries/CCOLAMD/CCOLAMD.info
+++ b/libraries/CCOLAMD/CCOLAMD.info
@@ -1,8 +1,8 @@
 PRGNAM="CCOLAMD"
-VERSION="2.7.2"
+VERSION="2.7.3"
 HOMEPAGE="http://www.cise.ufl.edu/research/sparse/ccolamd/"
-DOWNLOAD="http://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-2.7.2.tar.gz"
-MD5SUM="79d813d5b54951060fc264172bfb5ca6"
+DOWNLOAD="http://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-2.7.3.tar.gz"
+MD5SUM="eca668f34143c9ffa3901998c5f0bdf2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Kyle Guinn"
diff --git a/libraries/CCOLAMD/autotoolize.diff b/libraries/CCOLAMD/autotoolize.diff
index 7f1913c76c0..1c58db0eec6 100644
--- a/libraries/CCOLAMD/autotoolize.diff
+++ b/libraries/CCOLAMD/autotoolize.diff
@@ -3,7 +3,7 @@ new file mode 100644
 --- /dev/null
 +++ b/Demo/Makefile.am
 @@ -0,0 +1,31 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Include
++AM_CPPFLAGS = -I$(top_srcdir)/Include $(UFCONFIG_CFLAGS)
 +LDADD = $(top_builddir)/Source/libccolamd.la
 +
 +EXTRA_DIST = \
@@ -34,20 +34,29 @@ new file mode 100644
 +
 +clean-local:
 +	-$(RM) my_*.out
+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)/ccolamd
++pkginclude_HEADERS = ccolamd.h
 diff --git a/Makefile.am b/Makefile.am
 new file mode 100644
 --- /dev/null
 +++ b/Makefile.am
-@@ -0,0 +1,3 @@
-+SUBDIRS = Source Demo
+@@ -0,0 +1,5 @@
++SUBDIRS = Include Source Demo
 +EXTRA_DIST = README.txt Doc/ChangeLog Doc/lesser.txt
-+include_HEADERS = Include/ccolamd.h
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = ccolamd.pc
 diff --git a/Source/Makefile.am b/Source/Makefile.am
 new file mode 100644
 --- /dev/null
 +++ b/Source/Makefile.am
 @@ -0,0 +1,18 @@
-+AM_CPPFLAGS = -I$(top_builddir)/Include
++AM_CPPFLAGS = -I$(top_builddir)/Include $(UFCONFIG_CFLAGS)
 +
 +CCOLAMDSRC = \
 +	ccolamd.c
@@ -64,14 +73,31 @@ new file mode 100644
 +
 +libccolamd_la_SOURCES = ccolamd_global.c
 +libccolamd_la_LIBADD = libccolamdi.la libccolamdl.la
-+libccolamd_la_LDFLAGS = -no-undefined -version-info 9:2:7
++libccolamd_la_LDFLAGS = -no-undefined -version-info 9:3:7
+diff --git a/ccolamd.pc.in b/ccolamd.pc.in
+new file mode 100644
+--- /dev/null
++++ b/ccolamd.pc.in
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: @PACKAGE_NAME@
++Description: Constrained column approximate minimum degree ordering
++Version: @PACKAGE_VERSION@
++Requires.private: ufconfig
++Libs: -L${libdir} -lccolamd
++Libs.private: -lm
++Cflags: -I${includedir}/ccolamd
 diff --git a/configure.ac b/configure.ac
 new file mode 100644
 --- /dev/null
 +++ b/configure.ac
-@@ -0,0 +1,28 @@
-+AC_PREREQ([2.65])
-+AC_INIT([CCOLAMD], [2.7.2], [davis@cise.ufl.edu])
+@@ -0,0 +1,34 @@
++AC_PREREQ([2.68])
++AC_INIT([CCOLAMD],[2.7.3],[davis@cise.ufl.edu])
 +AC_CONFIG_SRCDIR([Source/ccolamd_global.c])
 +AC_CONFIG_HEADER([config.h])
 +AM_INIT_AUTOMAKE([foreign])
@@ -85,7 +111,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
 +
@@ -94,7 +124,9 @@ new file mode 100644
 +LIBS=$LIBS_SAVED
 +
 +AC_CONFIG_FILES([
++	ccolamd.pc
 +	Makefile
 +	Demo/Makefile
++	Include/Makefile
 +	Source/Makefile])
 +AC_OUTPUT