From 28559679237eeccc2f7f7152bbca776fa0667a72 Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Sat, 19 Nov 2016 01:10:39 -0600 Subject: academic/csparse: Updated for version 3.1.9. Signed-off-by: Kyle Guinn --- academic/csparse/autotoolize.diff | 212 ----------------------------- academic/csparse/csparse.SlackBuild | 17 ++- academic/csparse/csparse.info | 6 +- academic/csparse/patches/autotoolize.diff | 213 ++++++++++++++++++++++++++++++ 4 files changed, 226 insertions(+), 222 deletions(-) delete mode 100644 academic/csparse/autotoolize.diff create mode 100644 academic/csparse/patches/autotoolize.diff (limited to 'academic') diff --git a/academic/csparse/autotoolize.diff b/academic/csparse/autotoolize.diff deleted file mode 100644 index 767855dbaa..0000000000 --- a/academic/csparse/autotoolize.diff +++ /dev/null @@ -1,212 +0,0 @@ -diff --git a/Demo/Makefile.am b/Demo/Makefile.am -new file mode 100644 ---- /dev/null -+++ b/Demo/Makefile.am -@@ -0,0 +1,46 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/Include -+LDADD = $(top_builddir)/Source/libcsparse.la -+ -+EXTRA_DIST = \ -+ README.txt \ -+ cs_demo.out -+ -+# Disable the .out implicit pattern rule. Prevents GNU make from -+# adding bogus dependencies for the .out files listed above. -+%.out: % -+ -+noinst_HEADERS = \ -+ cs_demo.h -+ -+check_PROGRAMS = \ -+ cs_demo1 \ -+ cs_demo2 \ -+ cs_demo3 -+ -+cs_demo1_SOURCES = cs_demo1.c -+cs_demo2_SOURCES = cs_demo2.c cs_demo.c -+cs_demo3_SOURCES = cs_demo3.c cs_demo.c -+ -+MATRICES = \ -+ $(top_srcdir)/Matrix/ash219 \ -+ $(top_srcdir)/Matrix/bcsstk01 \ -+ $(top_srcdir)/Matrix/bcsstk01 \ -+ $(top_srcdir)/Matrix/bcsstk16 \ -+ $(top_srcdir)/Matrix/fs_183_1 \ -+ $(top_srcdir)/Matrix/lp_afiro \ -+ $(top_srcdir)/Matrix/mbeacxc \ -+ $(top_srcdir)/Matrix/t1 \ -+ $(top_srcdir)/Matrix/west0067 -+ -+check-local: $(check_PROGRAMS) $(MATRICES) -+ -./cs_demo1 < $(top_srcdir)/Matrix/t1 -+ -./cs_demo2 < $(top_srcdir)/Matrix/t1 -+ -./cs_demo2 < $(top_srcdir)/Matrix/ash219 -+ -./cs_demo2 < $(top_srcdir)/Matrix/bcsstk01 -+ -./cs_demo2 < $(top_srcdir)/Matrix/fs_183_1 -+ -./cs_demo2 < $(top_srcdir)/Matrix/mbeacxc -+ -./cs_demo2 < $(top_srcdir)/Matrix/west0067 -+ -./cs_demo2 < $(top_srcdir)/Matrix/lp_afiro -+ -./cs_demo2 < $(top_srcdir)/Matrix/bcsstk16 -+ -./cs_demo3 < $(top_srcdir)/Matrix/bcsstk01 -+ -./cs_demo3 < $(top_srcdir)/Matrix/bcsstk16 -diff --git a/Include/Makefile.am b/Include/Makefile.am -new file mode 100644 ---- /dev/null -+++ b/Include/Makefile.am -@@ -0,0 +1 @@ -+pkginclude_HEADERS = cs.h -diff --git a/Makefile.am b/Makefile.am -new file mode 100644 ---- /dev/null -+++ b/Makefile.am -@@ -0,0 +1,5 @@ -+SUBDIRS = Include Source Matrix Demo -+EXTRA_DIST = README.txt Doc/ChangeLog Doc/License.txt Doc/lesser.txt -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = csparse.pc -diff --git a/Matrix/Makefile.am b/Matrix/Makefile.am -new file mode 100644 ---- /dev/null -+++ b/Matrix/Makefile.am -@@ -0,0 +1,11 @@ -+dist_noinst_DATA = \ -+ ash219 \ -+ bcsstk01 \ -+ bcsstk16 \ -+ fs_183_1 \ -+ ibm32a \ -+ ibm32b \ -+ lp_afiro \ -+ mbeacxc \ -+ t1 \ -+ west0067 -diff --git a/Source/Makefile.am b/Source/Makefile.am -new file mode 100644 ---- /dev/null -+++ b/Source/Makefile.am -@@ -0,0 +1,62 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/Include -+ -+EXTRA_DIST = \ -+ README.txt -+ -+CSPARSESRC = \ -+ cs_add.c \ -+ cs_amd.c \ -+ cs_chol.c \ -+ cs_cholsol.c \ -+ cs_compress.c \ -+ cs_counts.c \ -+ cs_cumsum.c \ -+ cs_dfs.c \ -+ cs_dmperm.c \ -+ cs_droptol.c \ -+ cs_dropzeros.c \ -+ cs_dupl.c \ -+ cs_entry.c \ -+ cs_ereach.c \ -+ cs_etree.c \ -+ cs_fkeep.c \ -+ cs_gaxpy.c \ -+ cs_happly.c \ -+ cs_house.c \ -+ cs_ipvec.c \ -+ cs_leaf.c \ -+ cs_load.c \ -+ cs_lsolve.c \ -+ cs_ltsolve.c \ -+ cs_lu.c \ -+ cs_lusol.c \ -+ cs_malloc.c \ -+ cs_maxtrans.c \ -+ cs_multiply.c \ -+ cs_norm.c \ -+ cs_permute.c \ -+ cs_pinv.c \ -+ cs_post.c \ -+ cs_print.c \ -+ cs_pvec.c \ -+ cs_qr.c \ -+ cs_qrsol.c \ -+ cs_randperm.c \ -+ cs_reach.c \ -+ cs_scatter.c \ -+ cs_scc.c \ -+ cs_schol.c \ -+ cs_spsolve.c \ -+ cs_sqr.c \ -+ cs_symperm.c \ -+ cs_tdfs.c \ -+ cs_transpose.c \ -+ cs_updown.c \ -+ cs_usolve.c \ -+ cs_util.c \ -+ cs_utsolve.c -+ -+lib_LTLIBRARIES = libcsparse.la -+libcsparse_la_SOURCES = $(CSPARSESRC) -+libcsparse_la_LIBADD = -lm -+libcsparse_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,40 @@ -+# -*- Autoconf -*- -+# Process this file with autoconf to produce a configure script. -+ -+AC_PREREQ([2.69]) -+AC_INIT([CSparse],[3.1.4],[DrTimothyAldenDavis@gmail.com],[csparse],[http://www.suitesparse.com/]) -+AC_CONFIG_SRCDIR([Source/cs_print.c]) -+AC_CONFIG_HEADERS([config.h]) -+AM_INIT_AUTOMAKE([foreign]) -+LT_INIT -+ -+# Checks for programs. -+AC_PROG_INSTALL -+AC_PROG_CC -+ -+LIBS_SAVED=$LIBS -+ -+# Checks for libraries. -+AC_CHECK_LIB([m], [sqrt]) -+ -+# Checks for header files. -+AC_CHECK_HEADERS([limits.h stddef.h stdlib.h]) -+ -+# Checks for typedefs, structures, and compiler characteristics. -+AC_TYPE_SIZE_T -+ -+# Checks for library functions. -+AC_FUNC_MALLOC -+AC_FUNC_REALLOC -+AC_CHECK_FUNCS([sqrt]) -+ -+LIBS=$LIBS_SAVED -+ -+AC_CONFIG_FILES([ -+ csparse.pc -+ Makefile -+ Demo/Makefile -+ Include/Makefile -+ Matrix/Makefile -+ Source/Makefile]) -+AC_OUTPUT -diff --git a/csparse.pc.in b/csparse.pc.in -new file mode 100644 ---- /dev/null -+++ b/csparse.pc.in -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: @PACKAGE_NAME@ -+Description: A concise sparse matrix package -+Version: @PACKAGE_VERSION@ -+URL: @PACKAGE_URL@ -+Libs: -L${libdir} -lcsparse -+Libs.private: -lm -+Cflags: -I${includedir}/csparse diff --git a/academic/csparse/csparse.SlackBuild b/academic/csparse/csparse.SlackBuild index 525a66f6b0..64f4d270fa 100644 --- a/academic/csparse/csparse.SlackBuild +++ b/academic/csparse/csparse.SlackBuild @@ -25,14 +25,14 @@ PRGNAM=csparse SRCNAM=SuiteSparse SUBDIR=CSparse -VERSION=${VERSION:-3.1.4} -SRCVER=${SRCVER:-4.4.6} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.1.9} +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,10 +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" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -88,7 +90,8 @@ CFLAGS="$SLKCFLAGS" \ --enable-shared \ --disable-static \ --disable-dependency-tracking \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux \ + CFLAGS="$SLKCFLAGS" \ make make check diff --git a/academic/csparse/csparse.info b/academic/csparse/csparse.info index 4fdd26444f..3835d4eaa3 100644 --- a/academic/csparse/csparse.info +++ b/academic/csparse/csparse.info @@ -1,8 +1,8 @@ PRGNAM="csparse" -VERSION="3.1.4" +VERSION="3.1.9" 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="" diff --git a/academic/csparse/patches/autotoolize.diff b/academic/csparse/patches/autotoolize.diff new file mode 100644 index 0000000000..0fe8f18458 --- /dev/null +++ b/academic/csparse/patches/autotoolize.diff @@ -0,0 +1,213 @@ +diff --git a/Demo/Makefile.am b/Demo/Makefile.am +new file mode 100644 +--- /dev/null ++++ b/Demo/Makefile.am +@@ -0,0 +1,46 @@ ++AM_CPPFLAGS = -I$(top_srcdir)/Include ++LDADD = $(top_builddir)/Source/libcsparse.la ++ ++EXTRA_DIST = \ ++ README.txt \ ++ cs_demo.out ++ ++# Disable the .out implicit pattern rule. Prevents GNU make from ++# adding bogus dependencies for the .out files listed above. ++%.out: % ++ ++noinst_HEADERS = \ ++ cs_demo.h ++ ++check_PROGRAMS = \ ++ cs_demo1 \ ++ cs_demo2 \ ++ cs_demo3 ++ ++cs_demo1_SOURCES = cs_demo1.c ++cs_demo2_SOURCES = cs_demo2.c cs_demo.c ++cs_demo3_SOURCES = cs_demo3.c cs_demo.c ++ ++MATRICES = \ ++ $(top_srcdir)/Matrix/ash219 \ ++ $(top_srcdir)/Matrix/bcsstk01 \ ++ $(top_srcdir)/Matrix/bcsstk01 \ ++ $(top_srcdir)/Matrix/bcsstk16 \ ++ $(top_srcdir)/Matrix/fs_183_1 \ ++ $(top_srcdir)/Matrix/lp_afiro \ ++ $(top_srcdir)/Matrix/mbeacxc \ ++ $(top_srcdir)/Matrix/t1 \ ++ $(top_srcdir)/Matrix/west0067 ++ ++check-local: $(check_PROGRAMS) $(MATRICES) ++ -./cs_demo1 < $(top_srcdir)/Matrix/t1 ++ -./cs_demo2 < $(top_srcdir)/Matrix/t1 ++ -./cs_demo2 < $(top_srcdir)/Matrix/ash219 ++ -./cs_demo2 < $(top_srcdir)/Matrix/bcsstk01 ++ -./cs_demo2 < $(top_srcdir)/Matrix/fs_183_1 ++ -./cs_demo2 < $(top_srcdir)/Matrix/mbeacxc ++ -./cs_demo2 < $(top_srcdir)/Matrix/west0067 ++ -./cs_demo2 < $(top_srcdir)/Matrix/lp_afiro ++ -./cs_demo2 < $(top_srcdir)/Matrix/bcsstk16 ++ -./cs_demo3 < $(top_srcdir)/Matrix/bcsstk01 ++ -./cs_demo3 < $(top_srcdir)/Matrix/bcsstk16 +diff --git a/Include/Makefile.am b/Include/Makefile.am +new file mode 100644 +--- /dev/null ++++ b/Include/Makefile.am +@@ -0,0 +1 @@ ++pkginclude_HEADERS = cs.h +diff --git a/Makefile.am b/Makefile.am +new file mode 100644 +--- /dev/null ++++ b/Makefile.am +@@ -0,0 +1,4 @@ ++SUBDIRS = Include Source Matrix Demo ++EXTRA_DIST = README.txt Doc/ChangeLog Doc/License.txt Doc/lesser.txt ++ ++pkgconfig_DATA = csparse.pc +diff --git a/Matrix/Makefile.am b/Matrix/Makefile.am +new file mode 100644 +--- /dev/null ++++ b/Matrix/Makefile.am +@@ -0,0 +1,11 @@ ++dist_noinst_DATA = \ ++ ash219 \ ++ bcsstk01 \ ++ bcsstk16 \ ++ fs_183_1 \ ++ ibm32a \ ++ ibm32b \ ++ lp_afiro \ ++ mbeacxc \ ++ t1 \ ++ west0067 +diff --git a/Source/Makefile.am b/Source/Makefile.am +new file mode 100644 +--- /dev/null ++++ b/Source/Makefile.am +@@ -0,0 +1,62 @@ ++AM_CPPFLAGS = -I$(top_srcdir)/Include ++ ++EXTRA_DIST = \ ++ README.txt ++ ++CSPARSESRC = \ ++ cs_add.c \ ++ cs_amd.c \ ++ cs_chol.c \ ++ cs_cholsol.c \ ++ cs_compress.c \ ++ cs_counts.c \ ++ cs_cumsum.c \ ++ cs_dfs.c \ ++ cs_dmperm.c \ ++ cs_droptol.c \ ++ cs_dropzeros.c \ ++ cs_dupl.c \ ++ cs_entry.c \ ++ cs_ereach.c \ ++ cs_etree.c \ ++ cs_fkeep.c \ ++ cs_gaxpy.c \ ++ cs_happly.c \ ++ cs_house.c \ ++ cs_ipvec.c \ ++ cs_leaf.c \ ++ cs_load.c \ ++ cs_lsolve.c \ ++ cs_ltsolve.c \ ++ cs_lu.c \ ++ cs_lusol.c \ ++ cs_malloc.c \ ++ cs_maxtrans.c \ ++ cs_multiply.c \ ++ cs_norm.c \ ++ cs_permute.c \ ++ cs_pinv.c \ ++ cs_post.c \ ++ cs_print.c \ ++ cs_pvec.c \ ++ cs_qr.c \ ++ cs_qrsol.c \ ++ cs_randperm.c \ ++ cs_reach.c \ ++ cs_scatter.c \ ++ cs_scc.c \ ++ cs_schol.c \ ++ cs_spsolve.c \ ++ cs_sqr.c \ ++ cs_symperm.c \ ++ cs_tdfs.c \ ++ cs_transpose.c \ ++ cs_updown.c \ ++ cs_usolve.c \ ++ cs_util.c \ ++ cs_utsolve.c ++ ++lib_LTLIBRARIES = libcsparse.la ++libcsparse_la_SOURCES = $(CSPARSESRC) ++libcsparse_la_LIBADD = -lm ++libcsparse_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,42 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ([2.69]) ++AC_INIT([CSparse],[3.1.9],[DrTimothyAldenDavis@gmail.com],[csparse],[http://www.suitesparse.com/]) ++AC_CONFIG_SRCDIR([Source/cs_print.c]) ++AC_CONFIG_HEADERS([config.h]) ++AM_INIT_AUTOMAKE([foreign]) ++LT_INIT ++ ++# Checks for programs. ++AC_PROG_INSTALL ++AC_PROG_CC ++ ++AS_VAR_SET([LIBS_SAVED], [$LIBS]) ++ ++# Checks for libraries. ++AC_CHECK_LIB([m], [sqrt]) ++ ++# Checks for header files. ++AC_CHECK_HEADERS([limits.h stddef.h stdlib.h]) ++ ++# Checks for typedefs, structures, and compiler characteristics. ++AC_TYPE_SIZE_T ++ ++# Checks for library functions. ++AC_FUNC_MALLOC ++AC_FUNC_REALLOC ++AC_CHECK_FUNCS([sqrt]) ++ ++AS_VAR_SET([LIBS], [$LIBS_SAVED]) ++ ++PKG_INSTALLDIR ++AC_CONFIG_FILES([ ++ csparse.pc ++ Makefile ++ Demo/Makefile ++ Include/Makefile ++ Matrix/Makefile ++ Source/Makefile ++]) ++AC_OUTPUT +diff --git a/csparse.pc.in b/csparse.pc.in +new file mode 100644 +--- /dev/null ++++ b/csparse.pc.in +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: @PACKAGE_NAME@ ++Description: A concise sparse matrix package ++Version: @PACKAGE_VERSION@ ++URL: @PACKAGE_URL@ ++Libs: -L${libdir} -lcsparse ++Libs.private: -lm ++Cflags: -I${includedir}/csparse -- cgit v1.2.3