diff options
| -rw-r--r-- | academic/colamd/autotoolize.diff | 12 | ||||
| -rw-r--r-- | academic/colamd/colamd.SlackBuild | 44 | ||||
| -rw-r--r-- | academic/colamd/colamd.info | 8 |
3 files changed, 32 insertions, 32 deletions
diff --git a/academic/colamd/autotoolize.diff b/academic/colamd/autotoolize.diff index 632e5a2c10..3a525cf6d6 100644 --- a/academic/colamd/autotoolize.diff +++ b/academic/colamd/autotoolize.diff @@ -63,15 +63,15 @@ new file mode 100644 +noinst_LTLIBRARIES = libcolamdi.la libcolamdl.la + +libcolamdi_la_SOURCES = $(COLAMDSRC) -+libcolamdi_la_LIBADD = -lm ++libcolamdi_la_LIBADD = $(SUITESPARSECONFIG_LIBS) -lm + +libcolamdl_la_SOURCES = $(COLAMDSRC) -+libcolamdl_la_LIBADD = -lm ++libcolamdl_la_LIBADD = $(SUITESPARSECONFIG_LIBS) -lm +libcolamdl_la_CPPFLAGS = $(AM_CPPFLAGS) -DDLONG + -+libcolamd_la_SOURCES = colamd_global.c ++libcolamd_la_SOURCES = +libcolamd_la_LIBADD = libcolamdi.la libcolamdl.la -+libcolamd_la_LDFLAGS = -no-undefined -version-number 2:8:0 ++libcolamd_la_LDFLAGS = -no-undefined -release $(PACKAGE_VERSION) diff --git a/colamd.pc.in b/colamd.pc.in new file mode 100644 --- /dev/null @@ -99,8 +99,8 @@ new file mode 100644 +# Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.69]) -+AC_INIT([COLAMD],[2.8.0],[DrTimothyAldenDavis@gmail.com],[colamd],[http://www.suitesparse.com/]) -+AC_CONFIG_SRCDIR([Source/colamd_global.c]) ++AC_INIT([COLAMD],[2.9.1],[DrTimothyAldenDavis@gmail.com],[colamd],[http://www.suitesparse.com/]) ++AC_CONFIG_SRCDIR([Source/colamd.c]) +AC_CONFIG_HEADERS([config.h]) +AM_INIT_AUTOMAKE([foreign]) +LT_INIT diff --git a/academic/colamd/colamd.SlackBuild b/academic/colamd/colamd.SlackBuild index be5ee26e39..68a52fab71 100644 --- a/academic/colamd/colamd.SlackBuild +++ b/academic/colamd/colamd.SlackBuild @@ -2,29 +2,31 @@ # Slackware build script for COLAMD -# Copyright 2013 Kyle Guinn <elyk03@gmail.com>, USA +# Copyright 2013-2015 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. +# 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. +# 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=colamd -SRCNAM=COLAMD -VERSION=${VERSION:-2.8.0} +SRCNAM=SuiteSparse +SUBDIR=COLAMD +VERSION=${VERSION:-2.9.1} +SRCVER=${SRCVER:-4.4.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -58,7 +60,7 @@ else fi # Recommended by SuiteSparse -SLKCFLAGS="$SLKCFLAGS -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" +SLKCFLAGS="$SLKCFLAGS -fexceptions -D_FILE_OFFSET_BITS=64" set -e @@ -66,14 +68,10 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM +tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz +cd $SRCNAM/$SUBDIR chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +chmod -R u+w,go-w,a+rX-st . patch -p1 < $CWD/autotoolize.diff autoreconf -vif @@ -96,6 +94,8 @@ make make check make install-strip DESTDIR=$PKG +find $PKG/usr/lib${LIBDIRSUFFIX} -name '*.la' -delete + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/academic/colamd/colamd.info b/academic/colamd/colamd.info index 7b75dded2b..f724197f39 100644 --- a/academic/colamd/colamd.info +++ b/academic/colamd/colamd.info @@ -1,8 +1,8 @@ PRGNAM="colamd" -VERSION="2.8.0" -HOMEPAGE="https://www.cise.ufl.edu/research/sparse/colamd/" -DOWNLOAD="https://www.cise.ufl.edu/research/sparse/colamd/COLAMD-2.8.0.tar.gz" -MD5SUM="482dc4f958c2dafdd430d4c3148d15c5" +VERSION="2.9.1" +HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html" +DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz" +MD5SUM="e0af74476935c9ff6d971df8bb6b82fc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="suitesparseconfig" |