From 2faa53bf58bfe65bc25ab64d38d36a3cbe96dd18 Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Sat, 19 Nov 2016 01:41:27 -0600 Subject: academic/ldl: Updated for version 2.2.6. Signed-off-by: Kyle Guinn --- academic/ldl/autotoolize.diff | 208 ---------------------------------- academic/ldl/ldl.SlackBuild | 22 ++-- academic/ldl/ldl.info | 6 +- academic/ldl/patches/autotoolize.diff | 205 +++++++++++++++++++++++++++++++++ 4 files changed, 222 insertions(+), 219 deletions(-) delete mode 100644 academic/ldl/autotoolize.diff create mode 100644 academic/ldl/patches/autotoolize.diff diff --git a/academic/ldl/autotoolize.diff b/academic/ldl/autotoolize.diff deleted file mode 100644 index e51e7d852f..0000000000 --- a/academic/ldl/autotoolize.diff +++ /dev/null @@ -1,208 +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,57 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/Include $(AMD_CFLAGS) $(SUITESPARSECONFIG_CFLAGS) -+LDADD = $(top_builddir)/Source/libldl.la -+ -+EXTRA_DIST = \ -+ ldlamd.out \ -+ ldllamd.out \ -+ ldlmain.out \ -+ ldllmain.out \ -+ ldlsimple.out \ -+ ldllsimple.out -+ -+# Disable the .out implicit pattern rule. Prevents GNU make from -+# adding bogus dependencies for the .out files listed above. -+%.out: % -+ -+check_PROGRAMS = \ -+ ldlmain \ -+ ldllmain \ -+ ldlsimple \ -+ ldllsimple -+ -+if AMD -+check_PROGRAMS += \ -+ ldlamd \ -+ ldllamd -+ -+ldlamd_SOURCES = ldlmain.c -+ldlamd_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_AMD -+ldlamd_LDADD = $(LDADD) $(AMD_LIBS) -+ -+ldllamd_SOURCES = ldlmain.c -+ldllamd_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_AMD -DLDL_LONG -+ldllamd_LDADD = $(LDADD) $(AMD_LIBS) -+endif -+ -+ldlmain_SOURCES = ldlmain.c -+ -+ldllmain_SOURCES = ldlmain.c -+ldllmain_CPPFLAGS = $(AM_CPPFLAGS) -DLDL_LONG -+ -+ldlsimple_SOURCES = ldlsimple.c -+ -+ldllsimple_SOURCES = ldlsimple.c -+ldllsimple_CPPFLAGS = $(AM_CPPFLAGS) -DLDL_LONG -+ -+check-local: $(check_PROGRAMS) $(check_PROGRAMS:=.out) -+ @for i in $(check_PROGRAMS); do \ -+ echo "Testing $$i"; \ -+ (cd $(srcdir) && $(abs_builddir)/$$i$(EXEEXT)) > my_$$i.out; \ -+ if diff -u $(srcdir)/$$i.out my_$$i.out; then \ -+ echo "Test $$i PASSED."; \ -+ else \ -+ echo "Test $$i FAILED."; \ -+ fi; \ -+ done -+ -+CLEANFILES = my_*.out -diff --git a/Doc/Makefile.am b/Doc/Makefile.am -new file mode 100644 ---- /dev/null -+++ b/Doc/Makefile.am -@@ -0,0 +1,23 @@ -+EXTRA_DIST = ChangeLog lesser.txt -+ -+dist_noinst_DATA = ldl_userguide.tex ldl.bib -+dist_pdf_DATA = ldl_userguide.pdf -+ -+.INTERMEDIATE: ldl_userguide.bib -+ldl_userguide.bib: ldl.bib -+ $(LN_S) -f $< $@ -+ -+TEX = TEXINPUTS="$(srcdir):" pdflatex -interaction nonstopmode -file-line-error -+BIB = BIBINPUTS="$(srcdir):" bibtex -+%.pdf: %.tex %.bbl -+ $(TEX) $* -+ while grep -q "Rerun to get cross-references right" $*.log; do \ -+ $(TEX) $*; \ -+ done -+%.bbl: %.aux %.bib -+ $(BIB) $* -+%.aux: %.tex -+ $(TEX) $* -+ -+CLEANFILES = *.aux *.bbl *.blg *.log *.toc -+MAINTAINERCLEANFILES = $(dist_pdf_DATA) -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 = ldl.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 Doc -+EXTRA_DIST = README.txt -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = ldl.pc -diff --git a/Matrix/Makefile.am b/Matrix/Makefile.am -new file mode 100644 ---- /dev/null -+++ b/Matrix/Makefile.am -@@ -0,0 +1,4 @@ -+dist_noinst_DATA = \ -+ A01 A02 A03 A04 A05 A06 A07 A08 A09 A10 \ -+ A11 A12 A13 A14 A15 A16 A17 A18 A19 A20 \ -+ A21 A22 A23 A24 A25 A26 A27 A28 A29 A30 -diff --git a/Source/Makefile.am b/Source/Makefile.am -new file mode 100644 ---- /dev/null -+++ b/Source/Makefile.am -@@ -0,0 +1,16 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/Include $(SUITESPARSECONFIG_CFLAGS) -+ -+LDLSRC = \ -+ ldl.c -+ -+lib_LTLIBRARIES = libldl.la -+noinst_LTLIBRARIES = libldli.la libldll.la -+ -+libldli_la_SOURCES = $(LDLSRC) -+ -+libldll_la_SOURCES = $(LDLSRC) -+libldll_la_CPPFLAGS = $(AM_CPPFLAGS) -DLDL_LONG -+ -+libldl_la_SOURCES = -+libldl_la_LIBADD = libldli.la libldll.la -+libldl_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,50 @@ -+# -*- Autoconf -*- -+# Process this file with autoconf to produce a configure script. -+ -+AC_PREREQ([2.69]) -+AC_INIT([LDL],[2.2.1],[DrTimothyAldenDavis@gmail.com],[ldl],[http://www.suitesparse.com/]) -+AC_CONFIG_SRCDIR([Source/ldl.c]) -+AC_CONFIG_HEADERS([config.h]) -+AM_INIT_AUTOMAKE([foreign]) -+LT_INIT -+ -+# Checks for programs. -+AC_PROG_INSTALL -+AC_PROG_CC -+AC_PROG_LN_S -+ -+LIBS_SAVED=$LIBS -+ -+# Checks for libraries. -+PKG_PROG_PKG_CONFIG -+PKG_CHECK_MODULES([SUITESPARSECONFIG],[suitesparseconfig], -+ [], -+ [AC_MSG_ERROR([cannot find suitesparseconfig])]) -+PKG_CHECK_MODULES([AMD],[amd], -+ [amd="yes"], -+ [amd="no"]) -+if test "x$amd" != "xyes"; then -+ AC_MSG_WARN([cannot find amd, disabling some functionality]) -+fi -+ -+# Checks for header files. -+AC_CHECK_HEADERS([stdlib.h]) -+ -+# Checks for typedefs, structures, and compiler characteristics. -+ -+# Checks for library functions. -+AC_FUNC_MALLOC -+ -+LIBS=$LIBS_SAVED -+ -+AM_CONDITIONAL([AMD], [test "x$amd" = "xyes"]) -+ -+AC_CONFIG_FILES([ -+ ldl.pc -+ Makefile -+ Demo/Makefile -+ Doc/Makefile -+ Include/Makefile -+ Matrix/Makefile -+ Source/Makefile]) -+AC_OUTPUT -diff --git a/ldl.pc.in b/ldl.pc.in -new file mode 100644 ---- /dev/null -+++ b/ldl.pc.in -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: @PACKAGE_NAME@ -+Description: A simple LDL^T factorization -+Version: @PACKAGE_VERSION@ -+URL: @PACKAGE_URL@ -+Requires.private: suitesparseconfig -+Libs: -L${libdir} -lldl -+Cflags: -I${includedir}/ldl diff --git a/academic/ldl/ldl.SlackBuild b/academic/ldl/ldl.SlackBuild index 28b45b4d88..14acd63409 100644 --- a/academic/ldl/ldl.SlackBuild +++ b/academic/ldl/ldl.SlackBuild @@ -25,14 +25,14 @@ PRGNAM=ldl SRCNAM=SuiteSparse SUBDIR=LDL -VERSION=${VERSION:-2.2.1} -SRCVER=${SRCVER:-4.4.6} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.2.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 @@ -43,11 +43,14 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="README.txt Doc/ChangeLog Doc/lesser.txt" +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,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" \ +# Avoid rebuilding the docs. +touch Doc/ldl_userguide.pdf + ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -88,7 +93,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/ldl/ldl.info b/academic/ldl/ldl.info index 0a80f99767..f99349599c 100644 --- a/academic/ldl/ldl.info +++ b/academic/ldl/ldl.info @@ -1,8 +1,8 @@ PRGNAM="ldl" -VERSION="2.2.1" +VERSION="2.2.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/ldl/patches/autotoolize.diff b/academic/ldl/patches/autotoolize.diff new file mode 100644 index 0000000000..b3b0384649 --- /dev/null +++ b/academic/ldl/patches/autotoolize.diff @@ -0,0 +1,205 @@ +diff --git a/Demo/Makefile.am b/Demo/Makefile.am +new file mode 100644 +--- /dev/null ++++ b/Demo/Makefile.am +@@ -0,0 +1,57 @@ ++AM_CPPFLAGS = -I$(top_srcdir)/Include $(AMD_CFLAGS) $(SUITESPARSECONFIG_CFLAGS) ++LDADD = $(top_builddir)/Source/libldl.la ++ ++EXTRA_DIST = \ ++ ldlamd.out \ ++ ldllamd.out \ ++ ldlmain.out \ ++ ldllmain.out \ ++ ldlsimple.out \ ++ ldllsimple.out ++ ++# Disable the .out implicit pattern rule. Prevents GNU make from ++# adding bogus dependencies for the .out files listed above. ++%.out: % ++ ++check_PROGRAMS = \ ++ ldlmain \ ++ ldllmain \ ++ ldlsimple \ ++ ldllsimple ++ ++if AMD ++check_PROGRAMS += \ ++ ldlamd \ ++ ldllamd ++ ++ldlamd_SOURCES = ldlmain.c ++ldlamd_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_AMD ++ldlamd_LDADD = $(LDADD) $(AMD_LIBS) ++ ++ldllamd_SOURCES = ldlmain.c ++ldllamd_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_AMD -DLDL_LONG ++ldllamd_LDADD = $(LDADD) $(AMD_LIBS) ++endif ++ ++ldlmain_SOURCES = ldlmain.c ++ ++ldllmain_SOURCES = ldlmain.c ++ldllmain_CPPFLAGS = $(AM_CPPFLAGS) -DLDL_LONG ++ ++ldlsimple_SOURCES = ldlsimple.c ++ ++ldllsimple_SOURCES = ldlsimple.c ++ldllsimple_CPPFLAGS = $(AM_CPPFLAGS) -DLDL_LONG ++ ++check-local: $(check_PROGRAMS) $(check_PROGRAMS:=.out) ++ @for i in $(check_PROGRAMS); do \ ++ echo "Testing $$i"; \ ++ (cd $(srcdir) && $(abs_builddir)/$$i$(EXEEXT)) > my_$$i.out; \ ++ if diff -u $(srcdir)/$$i.out my_$$i.out; then \ ++ echo "Test $$i PASSED."; \ ++ else \ ++ echo "Test $$i FAILED."; \ ++ fi; \ ++ done ++ ++CLEANFILES = my_*.out +diff --git a/Doc/Makefile.am b/Doc/Makefile.am +new file mode 100644 +--- /dev/null ++++ b/Doc/Makefile.am +@@ -0,0 +1,23 @@ ++EXTRA_DIST = ChangeLog License.txt lesser.txt ++ ++dist_noinst_DATA = ldl_userguide.tex ldl.bib ++dist_pdf_DATA = ldl_userguide.pdf ++ ++.INTERMEDIATE: ldl_userguide.bib ++ldl_userguide.bib: ldl.bib ++ $(LN_S) -f $< $@ ++ ++TEX = TEXINPUTS="$(srcdir):" pdflatex -interaction nonstopmode -file-line-error ++BIB = BIBINPUTS="$(srcdir):" bibtex ++%.pdf: %.tex %.bbl ++ $(TEX) $* ++ while grep -q "Rerun to get cross-references right" $*.log; do \ ++ $(TEX) $*; \ ++ done ++%.bbl: %.aux %.bib ++ $(BIB) $* ++%.aux: %.tex ++ $(TEX) $* ++ ++CLEANFILES = *.aux *.bbl *.blg *.log *.toc ++MAINTAINERCLEANFILES = $(dist_pdf_DATA) +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 = ldl.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 Doc ++EXTRA_DIST = README.txt ++ ++pkgconfig_DATA = ldl.pc +diff --git a/Matrix/Makefile.am b/Matrix/Makefile.am +new file mode 100644 +--- /dev/null ++++ b/Matrix/Makefile.am +@@ -0,0 +1,4 @@ ++dist_noinst_DATA = \ ++ A01 A02 A03 A04 A05 A06 A07 A08 A09 A10 \ ++ A11 A12 A13 A14 A15 A16 A17 A18 A19 A20 \ ++ A21 A22 A23 A24 A25 A26 A27 A28 A29 A30 +diff --git a/Source/Makefile.am b/Source/Makefile.am +new file mode 100644 +--- /dev/null ++++ b/Source/Makefile.am +@@ -0,0 +1,16 @@ ++AM_CPPFLAGS = -I$(top_srcdir)/Include $(SUITESPARSECONFIG_CFLAGS) ++ ++LDLSRC = \ ++ ldl.c ++ ++lib_LTLIBRARIES = libldl.la ++noinst_LTLIBRARIES = libldli.la libldll.la ++ ++libldli_la_SOURCES = $(LDLSRC) ++ ++libldll_la_SOURCES = $(LDLSRC) ++libldll_la_CPPFLAGS = $(AM_CPPFLAGS) -DLDL_LONG ++ ++libldl_la_SOURCES = ++libldl_la_LIBADD = libldli.la libldll.la ++libldl_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,48 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ([2.69]) ++AC_INIT([LDL],[2.2.6],[DrTimothyAldenDavis@gmail.com],[ldl],[http://www.suitesparse.com/]) ++AC_CONFIG_SRCDIR([Source/ldl.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_LN_S ++ ++AS_VAR_SET([LIBS_SAVED], [$LIBS]) ++ ++# Checks for libraries. ++PKG_CHECK_MODULES([SUITESPARSECONFIG], [suitesparseconfig]) ++PKG_CHECK_MODULES([AMD], [amd], ++ [AS_VAR_SET([have_amd], [yes])], ++ [AS_VAR_SET([have_amd], [no]) ++ AC_MSG_WARN([$AMD_PKG_ERRORS (required by some demos), disabling some functionality])]) ++ ++# Checks for header files. ++AC_CHECK_HEADERS([stdlib.h]) ++ ++# Checks for typedefs, structures, and compiler characteristics. ++ ++# Checks for library functions. ++AC_FUNC_MALLOC ++ ++AS_VAR_SET([LIBS], [$LIBS_SAVED]) ++ ++AM_CONDITIONAL([AMD], [test "x$have_amd" = "xyes"]) ++ ++PKG_INSTALLDIR ++AC_CONFIG_FILES([ ++ ldl.pc ++ Makefile ++ Demo/Makefile ++ Doc/Makefile ++ Include/Makefile ++ Matrix/Makefile ++ Source/Makefile ++]) ++AC_OUTPUT +diff --git a/ldl.pc.in b/ldl.pc.in +new file mode 100644 +--- /dev/null ++++ b/ldl.pc.in +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: @PACKAGE_NAME@ ++Description: A simple LDL^T factorization ++Version: @PACKAGE_VERSION@ ++URL: @PACKAGE_URL@ ++Requires.private: suitesparseconfig ++Libs: -L${libdir} -lldl ++Cflags: -I${includedir}/ldl -- cgit v1.2.3