diff options
| -rw-r--r-- | academic/amd/amd.SlackBuild | 22 | ||||
| -rw-r--r-- | academic/amd/amd.info | 6 | ||||
| -rw-r--r-- | academic/amd/patches/autotoolize.diff (renamed from academic/amd/autotoolize.diff) | 19 |
3 files changed, 26 insertions, 21 deletions
diff --git a/academic/amd/amd.SlackBuild b/academic/amd/amd.SlackBuild index 982a4e26e992a..18dedf926b744 100644 --- a/academic/amd/amd.SlackBuild +++ b/academic/amd/amd.SlackBuild @@ -25,14 +25,14 @@ PRGNAM=amd SRCNAM=SuiteSparse SUBDIR=AMD -VERSION=${VERSION:-2.4.1} -SRCVER=${SRCVER:-4.4.6} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.4.6} +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 Doc/ChangeLog Doc/License.txt Doc/lesser.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,12 @@ 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" \ +# Avoid rebuilding the docs. +touch Doc/AMD_UserGuide.pdf + ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -89,7 +93,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/amd/amd.info b/academic/amd/amd.info index 2a85f345fae21..7e00843fb8b9f 100644 --- a/academic/amd/amd.info +++ b/academic/amd/amd.info @@ -1,8 +1,8 @@ PRGNAM="amd" -VERSION="2.4.1" +VERSION="2.4.6" 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="suitesparseconfig" diff --git a/academic/amd/autotoolize.diff b/academic/amd/patches/autotoolize.diff index 5f34c70409f83..a197808dbea37 100644 --- a/academic/amd/autotoolize.diff +++ b/academic/amd/patches/autotoolize.diff @@ -98,11 +98,10 @@ diff --git a/Makefile.am b/Makefile.am new file mode 100644 --- /dev/null +++ b/Makefile.am -@@ -0,0 +1,5 @@ +@@ -0,0 +1,4 @@ +SUBDIRS = Include Source Demo Doc +EXTRA_DIST = README.txt + -+pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = amd.pc diff --git a/Source/Makefile.am b/Source/Makefile.am new file mode 100644 @@ -169,26 +168,24 @@ new file mode 100644 +# Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.69]) -+AC_INIT([AMD],[2.4.1],[DrTimothyAldenDavis@gmail.com],[amd],[http://www.suitesparse.com/]) ++AC_INIT([AMD],[2.4.6],[DrTimothyAldenDavis@gmail.com],[amd],[http://www.suitesparse.com/]) +AC_CONFIG_SRCDIR([Source/amd_order.c]) +AC_CONFIG_HEADERS([config.h]) +AM_INIT_AUTOMAKE([foreign]) +LT_INIT + +# Checks for programs. ++PKG_PROG_PKG_CONFIG +AC_PROG_INSTALL +AC_PROG_CC +AC_PROG_F77 + -+LIBS_SAVED=$LIBS ++AS_VAR_SET([LIBS_SAVED], [$LIBS]) + +# Checks for libraries. +AC_CHECK_LIB([m], [sqrt]) + -+PKG_PROG_PKG_CONFIG -+PKG_CHECK_MODULES([SUITESPARSECONFIG],[suitesparseconfig], -+ [], -+ [AC_MSG_ERROR([cannot find suitesparseconfig])]) ++PKG_CHECK_MODULES([SUITESPARSECONFIG], [suitesparseconfig]) + +# Checks for header files. +AC_CHECK_HEADERS([limits.h stddef.h stdlib.h]) @@ -199,13 +196,15 @@ new file mode 100644 +# Checks for library functions. +AC_CHECK_FUNCS([sqrt]) + -+LIBS=$LIBS_SAVED ++AS_VAR_SET([LIBS], [$LIBS_SAVED]) + ++PKG_INSTALLDIR +AC_CONFIG_FILES([ + amd.pc + Makefile + Demo/Makefile + Doc/Makefile + Include/Makefile -+ Source/Makefile]) ++ Source/Makefile ++]) +AC_OUTPUT |