From d1283f4227249a34013ba7829d1f8b0db943058f Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Fri, 18 Nov 2016 22:23:34 -0600 Subject: academic/suitesparseconfig: Updated for version 4.5.3. Signed-off-by: Kyle Guinn --- academic/suitesparseconfig/autotoolize.diff | 92 --------------------- .../suitesparseconfig/patches/autotoolize.diff | 93 ++++++++++++++++++++++ .../suitesparseconfig/suitesparseconfig.SlackBuild | 17 ++-- academic/suitesparseconfig/suitesparseconfig.info | 6 +- 4 files changed, 106 insertions(+), 102 deletions(-) delete mode 100644 academic/suitesparseconfig/autotoolize.diff create mode 100644 academic/suitesparseconfig/patches/autotoolize.diff (limited to 'academic') diff --git a/academic/suitesparseconfig/autotoolize.diff b/academic/suitesparseconfig/autotoolize.diff deleted file mode 100644 index 0dd3b85acb1a..000000000000 --- a/academic/suitesparseconfig/autotoolize.diff +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -new file mode 100644 ---- /dev/null -+++ b/Makefile.am -@@ -0,0 +1,16 @@ -+SUBDIRS = xerbla -+ -+EXTRA_DIST = README.txt -+ -+# Octave doesn't find SuiteSparse_config.h if it's placed in a non-default search path. -+# Don't put it in a subdirectory for now. Update suitesparseconfig.pc.in if this changes. -+#pkginclude_HEADERS = SuiteSparse_config.h -+include_HEADERS = SuiteSparse_config.h -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = suitesparseconfig.pc -+ -+lib_LTLIBRARIES = libsuitesparseconfig.la -+libsuitesparseconfig_la_SOURCES = SuiteSparse_config.c -+libsuitesparseconfig_la_LIBADD = -lm -+libsuitesparseconfig_la_LDFLAGS = -no-undefined -release $(PACKAGE_VERSION) -diff --git a/configure.ac b/configure.ac -new file mode 100644 ---- /dev/null -+++ b/configure.ac -@@ -0,0 +1,37 @@ -+# -*- 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_CONFIG_SRCDIR([SuiteSparse_config.c]) -+AC_CONFIG_HEADERS([config.h]) -+AM_INIT_AUTOMAKE([foreign]) -+LT_INIT -+ -+# Checks for programs. -+AC_PROG_INSTALL -+AC_PROG_CC -+AC_PROG_F77 -+ -+LIBS_SAVED=$LIBS -+ -+# Checks for libraries. -+AC_CHECK_LIB([m], [sqrt]) -+ -+# 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_FUNC_MALLOC -+AC_CHECK_FUNCS([clock_gettime sqrt]) -+ -+LIBS=$LIBS_SAVED -+ -+AC_CONFIG_FILES([ -+ suitesparseconfig.pc -+ Makefile -+ xerbla/Makefile]) -+AC_OUTPUT -diff --git a/suitesparseconfig.pc.in b/suitesparseconfig.pc.in -new file mode 100644 ---- /dev/null -+++ b/suitesparseconfig.pc.in -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: @PACKAGE_NAME@ -+Description: SuiteSparse common library -+Version: @PACKAGE_VERSION@ -+URL: @PACKAGE_URL@ -+Libs: -L${libdir} -lsuitesparseconfig -+Libs.private: -lm -+Cflags: -I${includedir} -diff --git a/xerbla/Makefile.am b/xerbla/Makefile.am -new file mode 100644 ---- /dev/null -+++ b/xerbla/Makefile.am -@@ -0,0 +1,7 @@ -+noinst_HEADERS = xerbla.h -+noinst_LTLIBRARIES = libxerbla.la libcerbla.la -+ -+libxerbla_la_SOURCES = xerbla.f -+libxerbla_la_FFLAGS = $(AM_FFLAGS) -+libcerbla_la_SOURCES = xerbla.c -+libcerbla_la_CFLAGS = $(AM_CFLAGS) diff --git a/academic/suitesparseconfig/patches/autotoolize.diff b/academic/suitesparseconfig/patches/autotoolize.diff new file mode 100644 index 000000000000..4706be9b9eeb --- /dev/null +++ b/academic/suitesparseconfig/patches/autotoolize.diff @@ -0,0 +1,93 @@ +diff --git a/Makefile.am b/Makefile.am +new file mode 100644 +--- /dev/null ++++ b/Makefile.am +@@ -0,0 +1,15 @@ ++SUBDIRS = xerbla ++ ++EXTRA_DIST = README.txt ++ ++# Octave doesn't find SuiteSparse_config.h if it's placed in a non-default search path. ++# Don't put it in a subdirectory for now. Update suitesparseconfig.pc.in if this changes. ++#pkginclude_HEADERS = SuiteSparse_config.h ++include_HEADERS = SuiteSparse_config.h ++ ++pkgconfig_DATA = suitesparseconfig.pc ++ ++lib_LTLIBRARIES = libsuitesparseconfig.la ++libsuitesparseconfig_la_SOURCES = SuiteSparse_config.c ++libsuitesparseconfig_la_LIBADD = -lm ++libsuitesparseconfig_la_LDFLAGS = -no-undefined -release $(PACKAGE_VERSION) +diff --git a/configure.ac b/configure.ac +new file mode 100644 +--- /dev/null ++++ b/configure.ac +@@ -0,0 +1,39 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ([2.69]) ++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]) ++LT_INIT ++ ++# Checks for programs. ++AC_PROG_INSTALL ++AC_PROG_CC ++AC_PROG_F77 ++ ++AS_VAR_SET([LIBS_SAVED], [$LIBS]) ++ ++# Checks for libraries. ++AC_CHECK_LIB([m], [sqrt]) ++ ++# 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_FUNC_MALLOC ++AC_CHECK_FUNCS([clock_gettime sqrt]) ++ ++AS_VAR_SET([LIBS], [$LIBS_SAVED]) ++ ++PKG_INSTALLDIR ++AC_CONFIG_FILES([ ++ suitesparseconfig.pc ++ Makefile ++ xerbla/Makefile ++]) ++AC_OUTPUT +diff --git a/suitesparseconfig.pc.in b/suitesparseconfig.pc.in +new file mode 100644 +--- /dev/null ++++ b/suitesparseconfig.pc.in +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: @PACKAGE_NAME@ ++Description: SuiteSparse common library ++Version: @PACKAGE_VERSION@ ++URL: @PACKAGE_URL@ ++Libs: -L${libdir} -lsuitesparseconfig ++Libs.private: -lm ++Cflags: -I${includedir} +diff --git a/xerbla/Makefile.am b/xerbla/Makefile.am +new file mode 100644 +--- /dev/null ++++ b/xerbla/Makefile.am +@@ -0,0 +1,7 @@ ++noinst_HEADERS = xerbla.h ++noinst_LTLIBRARIES = libxerbla.la libcerbla.la ++ ++libxerbla_la_SOURCES = xerbla.f ++libxerbla_la_FFLAGS = $(AM_FFLAGS) ++libcerbla_la_SOURCES = xerbla.c ++libcerbla_la_CFLAGS = $(AM_CFLAGS) diff --git a/academic/suitesparseconfig/suitesparseconfig.SlackBuild b/academic/suitesparseconfig/suitesparseconfig.SlackBuild index 7f75381f9656..282bd3213696 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 25e6ffe0277b..0e328def37cc 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="" -- cgit v1.2.3