diff options
| -rw-r--r-- | libraries/CCOLAMD/CCOLAMD.SlackBuild | 25 | ||||
| -rw-r--r-- | libraries/CCOLAMD/CCOLAMD.info | 10 | ||||
| -rw-r--r-- | libraries/CCOLAMD/autotoolize.diff | 45 |
3 files changed, 54 insertions, 26 deletions
diff --git a/libraries/CCOLAMD/CCOLAMD.SlackBuild b/libraries/CCOLAMD/CCOLAMD.SlackBuild index 30acef0fbc..9f2467d285 100644 --- a/libraries/CCOLAMD/CCOLAMD.SlackBuild +++ b/libraries/CCOLAMD/CCOLAMD.SlackBuild @@ -1,10 +1,29 @@ #!/bin/sh # Slackware build script for CCOLAMD -# Written by Kyle Guinn <elyk03@gmail.com> + +# Copyright 2013 Kyle Guinn <elyk03@gmail.com>, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=CCOLAMD -VERSION=${VERSION:-2.7.3} +VERSION=${VERSION:-2.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,9 +88,11 @@ CFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-shared \ --disable-static \ + --disable-dependency-tracking \ --build=$ARCH-slackware-linux make +make check make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/libraries/CCOLAMD/CCOLAMD.info b/libraries/CCOLAMD/CCOLAMD.info index eac8f048c3..2fa1a32182 100644 --- a/libraries/CCOLAMD/CCOLAMD.info +++ b/libraries/CCOLAMD/CCOLAMD.info @@ -1,10 +1,10 @@ PRGNAM="CCOLAMD" -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.3.tar.gz" -MD5SUM="eca668f34143c9ffa3901998c5f0bdf2" +VERSION="2.8.0" +HOMEPAGE="https://www.cise.ufl.edu/research/sparse/ccolamd/" +DOWNLOAD="https://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-2.8.0.tar.gz" +MD5SUM="a0af8b91c3d24eba5d4818e88c6c288c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="UFconfig" +REQUIRES="SuiteSparse_config" MAINTAINER="Kyle Guinn" EMAIL="elyk03@gmail.com" diff --git a/libraries/CCOLAMD/autotoolize.diff b/libraries/CCOLAMD/autotoolize.diff index 1c58db0eec..a3058ca550 100644 --- a/libraries/CCOLAMD/autotoolize.diff +++ b/libraries/CCOLAMD/autotoolize.diff @@ -2,8 +2,8 @@ diff --git a/Demo/Makefile.am b/Demo/Makefile.am new file mode 100644 --- /dev/null +++ b/Demo/Makefile.am -@@ -0,0 +1,31 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/Include $(UFCONFIG_CFLAGS) +@@ -0,0 +1,30 @@ ++AM_CPPFLAGS = -I$(top_srcdir)/Include $(SUITESPARSECONFIG_CFLAGS) +LDADD = $(top_builddir)/Source/libccolamd.la + +EXTRA_DIST = \ @@ -25,21 +25,19 @@ new file mode 100644 + @for i in $(check_PROGRAMS); do \ + echo "Testing $$i"; \ + ./$$i$(EXEEXT) > my_$$i.out; \ -+ if diff -u $$i.out my_$$i.out; then \ ++ if diff -u $(srcdir)/$$i.out my_$$i.out; then \ + echo "Test $$i PASSED."; \ + else \ + echo "Test $$i FAILED."; \ + fi; \ + done + -+clean-local: -+ -$(RM) my_*.out ++CLEANFILES = 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 +@@ -0,0 +1 @@ +pkginclude_HEADERS = ccolamd.h diff --git a/Makefile.am b/Makefile.am new file mode 100644 @@ -56,7 +54,7 @@ new file mode 100644 --- /dev/null +++ b/Source/Makefile.am @@ -0,0 +1,18 @@ -+AM_CPPFLAGS = -I$(top_builddir)/Include $(UFCONFIG_CFLAGS) ++AM_CPPFLAGS = -I$(top_srcdir)/Include $(SUITESPARSECONFIG_CFLAGS) + +CCOLAMDSRC = \ + ccolamd.c @@ -73,12 +71,12 @@ 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:3:7 ++libccolamd_la_LDFLAGS = -no-undefined -version-number 2:8:0 diff --git a/ccolamd.pc.in b/ccolamd.pc.in new file mode 100644 --- /dev/null +++ b/ccolamd.pc.in -@@ -0,0 +1,12 @@ +@@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ @@ -87,7 +85,8 @@ new file mode 100644 +Name: @PACKAGE_NAME@ +Description: Constrained column approximate minimum degree ordering +Version: @PACKAGE_VERSION@ -+Requires.private: ufconfig ++URL: @PACKAGE_URL@ ++Requires.private: suitesparseconfig +Libs: -L${libdir} -lccolamd +Libs.private: -lm +Cflags: -I${includedir}/ccolamd @@ -95,30 +94,38 @@ diff --git a/configure.ac b/configure.ac new file mode 100644 --- /dev/null +++ b/configure.ac -@@ -0,0 +1,34 @@ -+AC_PREREQ([2.68]) -+AC_INIT([CCOLAMD],[2.7.3],[davis@cise.ufl.edu]) +@@ -0,0 +1,42 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ([2.69]) ++AC_INIT([CCOLAMD],[2.8.0],[DrTimothyAldenDavis@gmail.com],[ccolamd],[http://www.suitesparse.com/]) +AC_CONFIG_SRCDIR([Source/ccolamd_global.c]) -+AC_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) +AM_INIT_AUTOMAKE([foreign]) +LT_INIT + ++# Checks for programs. +AC_PROG_INSTALL +AC_PROG_CC + +LIBS_SAVED=$LIBS + ++# Checks for libraries. +AC_CHECK_LIB([m], [sqrt]) + -+AC_CHECK_HEADERS([limits.h stdlib.h]) -+ +PKG_PROG_PKG_CONFIG -+PKG_CHECK_MODULES([UFCONFIG],[ufconfig], ++PKG_CHECK_MODULES([SUITESPARSECONFIG],[suitesparseconfig], + [], -+ [AC_MSG_ERROR([cannot find ufconfig])]) ++ [AC_MSG_ERROR([cannot find suitesparseconfig])]) ++ ++# Checks for header files. ++AC_CHECK_HEADERS([limits.h stdlib.h]) + ++# Checks for typedefs, structures, and compiler characteristics. +AC_TYPE_SIZE_T + ++# Checks for library functions. +AC_CHECK_FUNCS([sqrt]) + +LIBS=$LIBS_SAVED |