diff options
| -rw-r--r-- | academic/klu/autotoolize.diff | 12 | ||||
| -rw-r--r-- | academic/klu/klu.SlackBuild | 44 | ||||
| -rw-r--r-- | academic/klu/klu.info | 8 |
3 files changed, 32 insertions, 32 deletions
diff --git a/academic/klu/autotoolize.diff b/academic/klu/autotoolize.diff index a29a03a0ba..14637bb95d 100644 --- a/academic/klu/autotoolize.diff +++ b/academic/klu/autotoolize.diff @@ -139,7 +139,7 @@ new file mode 100644 --- /dev/null +++ b/Source/Makefile.am @@ -0,0 +1,40 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/Include $(AMD_CFLAGS) $(COLAMD_CFLAGS) $(BTF_CFLAGS) ++AM_CPPFLAGS = -I$(top_srcdir)/Include $(AMD_CFLAGS) $(COLAMD_CFLAGS) $(BTF_CFLAGS) $(SUITESPARSECONFIG_CFLAGS) + +noinst_LTLIBRARIES = libklud.la libkluz.la libklul.la libkluzl.la + @@ -177,8 +177,8 @@ new file mode 100644 + +lib_LTLIBRARIES = libklu.la +libklu_la_SOURCES = -+libklu_la_LIBADD = libklud.la libkluz.la libklul.la libkluzl.la $(AMD_LIBS) $(COLAMD_LIBS) $(BTF_LIBS) -+libklu_la_LDFLAGS = -no-undefined -version-number 1:2:1 ++libklu_la_LIBADD = libklud.la libkluz.la libklul.la libkluzl.la $(AMD_LIBS) $(COLAMD_LIBS) $(BTF_LIBS) $(SUITESPARSECONFIG_LIBS) ++libklu_la_LDFLAGS = -no-undefined -release $(PACKAGE_VERSION) diff --git a/User/Makefile.am b/User/Makefile.am new file mode 100644 --- /dev/null @@ -194,7 +194,7 @@ new file mode 100644 +lib_LTLIBRARIES = libklu_cholmod.la +libklu_cholmod_la_SOURCES = klu_cholmod.c klu_l_cholmod.c +libklu_cholmod_la_LIBADD = $(CHOLMOD_LIBS) -+libklu_cholmod_la_LDFLAGS = -no-undefined -version-number 1:2:1 ++libklu_cholmod_la_LDFLAGS = -no-undefined -release $(PACKAGE_VERSION) +endif diff --git a/configure.ac b/configure.ac new file mode 100644 @@ -205,7 +205,7 @@ new file mode 100644 +# Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.69]) -+AC_INIT([KLU],[1.2.1],[DrTimothyAldenDavis@gmail.com],[klu],[http://www.suitesparse.com/]) ++AC_INIT([KLU],[1.3.2],[DrTimothyAldenDavis@gmail.com],[klu],[http://www.suitesparse.com/]) +AC_CONFIG_SRCDIR([Source/klu.c]) +AC_CONFIG_HEADERS([config.h]) +AM_INIT_AUTOMAKE([foreign]) @@ -277,7 +277,7 @@ new file mode 100644 +Description: Sparse LU factorization for circuit simulation +Version: @PACKAGE_VERSION@ +URL: @PACKAGE_URL@ -+Requires.private: amd colamd btf ++Requires.private: suitesparseconfig amd colamd btf +Libs: -L${libdir} -lklu +Libs.private: -lm +Cflags: -I${includedir}/klu diff --git a/academic/klu/klu.SlackBuild b/academic/klu/klu.SlackBuild index 237c7c02e6..7eb1edc270 100644 --- a/academic/klu/klu.SlackBuild +++ b/academic/klu/klu.SlackBuild @@ -2,29 +2,31 @@ # Slackware build script for KLU -# 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=klu -SRCNAM=KLU -VERSION=${VERSION:-1.2.1} +SRCNAM=SuiteSparse +SUBDIR=KLU +VERSION=${VERSION:-1.3.2} +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/klu/klu.info b/academic/klu/klu.info index 9d00b8e7f5..37fe1bb524 100644 --- a/academic/klu/klu.info +++ b/academic/klu/klu.info @@ -1,8 +1,8 @@ PRGNAM="klu" -VERSION="1.2.1" -HOMEPAGE="https://www.cise.ufl.edu/research/sparse/klu/" -DOWNLOAD="https://www.cise.ufl.edu/research/sparse/klu/KLU-1.2.1.tar.gz" -MD5SUM="3ab15b997a5c8fd37d33c290e03b29e5" +VERSION="1.3.2" +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 amd colamd btf" |