diff options
| -rw-r--r-- | academic/suitesparseconfig/patches/autotoolize.diff (renamed from academic/suitesparseconfig/autotoolize.diff) | 15 | ||||
| -rw-r--r-- | academic/suitesparseconfig/suitesparseconfig.SlackBuild | 17 | ||||
| -rw-r--r-- | academic/suitesparseconfig/suitesparseconfig.info | 6 |
3 files changed, 21 insertions, 17 deletions
diff --git a/academic/suitesparseconfig/autotoolize.diff b/academic/suitesparseconfig/patches/autotoolize.diff index 0dd3b85acb..4706be9b9e 100644 --- a/academic/suitesparseconfig/autotoolize.diff +++ b/academic/suitesparseconfig/patches/autotoolize.diff @@ -2,7 +2,7 @@ diff --git a/Makefile.am b/Makefile.am new file mode 100644 --- /dev/null +++ b/Makefile.am -@@ -0,0 +1,16 @@ +@@ -0,0 +1,15 @@ +SUBDIRS = xerbla + +EXTRA_DIST = README.txt @@ -12,7 +12,6 @@ new file mode 100644 +#pkginclude_HEADERS = SuiteSparse_config.h +include_HEADERS = SuiteSparse_config.h + -+pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = suitesparseconfig.pc + +lib_LTLIBRARIES = libsuitesparseconfig.la @@ -23,12 +22,12 @@ diff --git a/configure.ac b/configure.ac new file mode 100644 --- /dev/null +++ b/configure.ac -@@ -0,0 +1,37 @@ +@@ -0,0 +1,39 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.69]) -+AC_INIT([SuiteSparse_config],[4.4.6],[DrTimothyAldenDavis@gmail.com],[suitesparseconfig],[http://www.suitesparse.com/]) ++AC_INIT([SuiteSparse_config],[4.5.3],[DrTimothyAldenDavis@gmail.com],[suitesparseconfig],[http://www.suitesparse.com/]) +AC_CONFIG_SRCDIR([SuiteSparse_config.c]) +AC_CONFIG_HEADERS([config.h]) +AM_INIT_AUTOMAKE([foreign]) @@ -39,7 +38,7 @@ new file mode 100644 +AC_PROG_CC +AC_PROG_F77 + -+LIBS_SAVED=$LIBS ++AS_VAR_SET([LIBS_SAVED], [$LIBS]) + +# Checks for libraries. +AC_CHECK_LIB([m], [sqrt]) @@ -54,12 +53,14 @@ new file mode 100644 +AC_FUNC_MALLOC +AC_CHECK_FUNCS([clock_gettime sqrt]) + -+LIBS=$LIBS_SAVED ++AS_VAR_SET([LIBS], [$LIBS_SAVED]) + ++PKG_INSTALLDIR +AC_CONFIG_FILES([ + suitesparseconfig.pc + Makefile -+ xerbla/Makefile]) ++ xerbla/Makefile ++]) +AC_OUTPUT diff --git a/suitesparseconfig.pc.in b/suitesparseconfig.pc.in new file mode 100644 diff --git a/academic/suitesparseconfig/suitesparseconfig.SlackBuild b/academic/suitesparseconfig/suitesparseconfig.SlackBuild index 7f75381f96..282bd32136 100644 --- a/academic/suitesparseconfig/suitesparseconfig.SlackBuild +++ b/academic/suitesparseconfig/suitesparseconfig.SlackBuild @@ -25,14 +25,14 @@ PRGNAM=suitesparseconfig SRCNAM=SuiteSparse SUBDIR=SuiteSparse_config -VERSION=${VERSION:-4.4.6} -SRCVER=${SRCVER:-4.4.6} +VERSION=${VERSION:-4.5.3} +SRCVER=${SRCVER:-4.5.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$(uname -m) ;; esac @@ -48,6 +48,9 @@ DOCS="README.txt" if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" @@ -73,11 +76,9 @@ cd $SRCNAM/$SUBDIR chown -R root:root . chmod -R u+w,go-w,a+rX-st . -patch -p1 < $CWD/autotoolize.diff +patch -p1 < $CWD/patches/autotoolize.diff autoreconf -vif -CFLAGS="$SLKCFLAGS" \ -FFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -89,7 +90,9 @@ FFLAGS="$SLKCFLAGS" \ --enable-shared \ --disable-static \ --disable-dependency-tracking \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux \ + CFLAGS="$SLKCFLAGS" \ + FFLAGS="$SLKCFLAGS" \ make make check diff --git a/academic/suitesparseconfig/suitesparseconfig.info b/academic/suitesparseconfig/suitesparseconfig.info index 25e6ffe027..0e328def37 100644 --- a/academic/suitesparseconfig/suitesparseconfig.info +++ b/academic/suitesparseconfig/suitesparseconfig.info @@ -1,8 +1,8 @@ PRGNAM="suitesparseconfig" -VERSION="4.4.6" +VERSION="4.5.3" HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html" -DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz" -MD5SUM="131a3a5e2dee784cd946284e44ce9af2" +DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.5.3.tar.gz" +MD5SUM="8ec57324585df3c6483ad7f556afccbd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |