academic/ccolamd: Updated for version 2.9.6.

Signed-off-by: Kyle Guinn <elyk03@gmail.com>
This commit is contained in:
Kyle Guinn 2016-11-19 00:54:09 -06:00 committed by David Spencer
parent 3116f65b5d
commit b11534756d
3 changed files with 24 additions and 22 deletions

View file

@ -25,14 +25,14 @@
PRGNAM=ccolamd PRGNAM=ccolamd
SRCNAM=SuiteSparse SRCNAM=SuiteSparse
SUBDIR=CCOLAMD SUBDIR=CCOLAMD
VERSION=${VERSION:-2.9.1} VERSION=${VERSION:-2.9.6}
SRCVER=${SRCVER:-4.4.6} SRCVER=${SRCVER:-4.5.3}
BUILD=${BUILD:-2} BUILD=${BUILD:-1}
TAG=${TAG:-_SBo} TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then if [ -z "$ARCH" ]; then
case "$(uname -m)" in case "$(uname -m)" in
i?86) ARCH=i486 ;; i?86) ARCH=i586 ;;
arm*) ARCH=arm ;; arm*) ARCH=arm ;;
*) ARCH=$(uname -m) ;; *) ARCH=$(uname -m) ;;
esac esac
@ -43,11 +43,14 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp} OUTPUT=${OUTPUT:-/tmp}
DOCS="README.txt Doc/ChangeLog Doc/lesser.txt" DOCS="README.txt Doc/ChangeLog Doc/License.txt Doc/lesser.txt"
if [ "$ARCH" = "i486" ]; then if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686" SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX="" LIBDIRSUFFIX=""
elif [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686" SLKCFLAGS="-O2 -march=i686 -mtune=i686"
LIBDIRSUFFIX="" LIBDIRSUFFIX=""
@ -73,10 +76,9 @@ cd $SRCNAM/$SUBDIR
chown -R root:root . chown -R root:root .
chmod -R u+w,go-w,a+rX-st . chmod -R u+w,go-w,a+rX-st .
patch -p1 < $CWD/autotoolize.diff patch -p1 < $CWD/patches/autotoolize.diff
autoreconf -vif autoreconf -vif
CFLAGS="$SLKCFLAGS" \
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \ --libdir=/usr/lib${LIBDIRSUFFIX} \
@ -88,7 +90,8 @@ CFLAGS="$SLKCFLAGS" \
--enable-shared \ --enable-shared \
--disable-static \ --disable-static \
--disable-dependency-tracking \ --disable-dependency-tracking \
--build=$ARCH-slackware-linux --build=$ARCH-slackware-linux \
CFLAGS="$SLKCFLAGS" \
make make
make check make check

View file

@ -1,8 +1,8 @@
PRGNAM="ccolamd" PRGNAM="ccolamd"
VERSION="2.9.1" VERSION="2.9.6"
HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html" HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz" DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.5.3.tar.gz"
MD5SUM="131a3a5e2dee784cd946284e44ce9af2" MD5SUM="8ec57324585df3c6483ad7f556afccbd"
DOWNLOAD_x86_64="" DOWNLOAD_x86_64=""
MD5SUM_x86_64="" MD5SUM_x86_64=""
REQUIRES="suitesparseconfig" REQUIRES="suitesparseconfig"

View file

@ -43,11 +43,10 @@ diff --git a/Makefile.am b/Makefile.am
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/Makefile.am +++ b/Makefile.am
@@ -0,0 +1,5 @@ @@ -0,0 +1,4 @@
+SUBDIRS = Include Source Demo +SUBDIRS = Include Source Demo
+EXTRA_DIST = README.txt Doc/ChangeLog Doc/lesser.txt +EXTRA_DIST = README.txt Doc/ChangeLog Doc/License.txt Doc/lesser.txt
+ +
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ccolamd.pc +pkgconfig_DATA = ccolamd.pc
diff --git a/Source/Makefile.am b/Source/Makefile.am diff --git a/Source/Makefile.am b/Source/Makefile.am
new file mode 100644 new file mode 100644
@ -99,25 +98,23 @@ new file mode 100644
+# Process this file with autoconf to produce a configure script. +# Process this file with autoconf to produce a configure script.
+ +
+AC_PREREQ([2.69]) +AC_PREREQ([2.69])
+AC_INIT([CCOLAMD],[2.9.1],[DrTimothyAldenDavis@gmail.com],[ccolamd],[http://www.suitesparse.com/]) +AC_INIT([CCOLAMD],[2.9.6],[DrTimothyAldenDavis@gmail.com],[ccolamd],[http://www.suitesparse.com/])
+AC_CONFIG_SRCDIR([Source/ccolamd.c]) +AC_CONFIG_SRCDIR([Source/ccolamd.c])
+AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([foreign])
+LT_INIT +LT_INIT
+ +
+# Checks for programs. +# Checks for programs.
+PKG_PROG_PKG_CONFIG
+AC_PROG_INSTALL +AC_PROG_INSTALL
+AC_PROG_CC +AC_PROG_CC
+ +
+LIBS_SAVED=$LIBS +AS_VAR_SET([LIBS_SAVED], [$LIBS])
+ +
+# Checks for libraries. +# Checks for libraries.
+AC_CHECK_LIB([m], [sqrt]) +AC_CHECK_LIB([m], [sqrt])
+ +
+PKG_PROG_PKG_CONFIG +PKG_CHECK_MODULES([SUITESPARSECONFIG], [suitesparseconfig])
+PKG_CHECK_MODULES([SUITESPARSECONFIG],[suitesparseconfig],
+ [],
+ [AC_MSG_ERROR([cannot find suitesparseconfig])])
+ +
+# Checks for header files. +# Checks for header files.
+AC_CHECK_HEADERS([limits.h stdlib.h]) +AC_CHECK_HEADERS([limits.h stdlib.h])
@ -128,12 +125,14 @@ new file mode 100644
+# Checks for library functions. +# Checks for library functions.
+AC_CHECK_FUNCS([sqrt]) +AC_CHECK_FUNCS([sqrt])
+ +
+LIBS=$LIBS_SAVED +AS_VAR_SET([LIBS], [$LIBS_SAVED])
+ +
+PKG_INSTALLDIR
+AC_CONFIG_FILES([ +AC_CONFIG_FILES([
+ ccolamd.pc + ccolamd.pc
+ Makefile + Makefile
+ Demo/Makefile + Demo/Makefile
+ Include/Makefile + Include/Makefile
+ Source/Makefile]) + Source/Makefile
+])
+AC_OUTPUT +AC_OUTPUT