From dbcd6295df45f051aa317a2e626ec6478371ff65 Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Sat, 19 Nov 2016 01:50:03 -0600 Subject: academic/btf: Updated for version 1.2.6. Signed-off-by: Kyle Guinn --- academic/btf/autotoolize.diff | 94 ----------------------------------- academic/btf/btf.SlackBuild | 19 ++++--- academic/btf/btf.info | 6 +-- academic/btf/patches/autotoolize.diff | 93 ++++++++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+), 105 deletions(-) delete mode 100644 academic/btf/autotoolize.diff create mode 100644 academic/btf/patches/autotoolize.diff (limited to 'academic') diff --git a/academic/btf/autotoolize.diff b/academic/btf/autotoolize.diff deleted file mode 100644 index 3ee93b8c58..0000000000 --- a/academic/btf/autotoolize.diff +++ /dev/null @@ -1,94 +0,0 @@ -diff --git a/Include/Makefile.am b/Include/Makefile.am -new file mode 100644 ---- /dev/null -+++ b/Include/Makefile.am -@@ -0,0 +1,2 @@ -+pkginclude_HEADERS = btf.h -+noinst_HEADERS = btf_internal.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 -+EXTRA_DIST = README.txt Doc/ChangeLog Doc/lesser.txt -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = btf.pc -diff --git a/Source/Makefile.am b/Source/Makefile.am -new file mode 100644 ---- /dev/null -+++ b/Source/Makefile.am -@@ -0,0 +1,18 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/Include $(SUITESPARSECONFIG_CFLAGS) -+ -+BTFSRC = \ -+ btf_maxtrans.c \ -+ btf_order.c \ -+ btf_strongcomp.c -+ -+lib_LTLIBRARIES = libbtf.la -+noinst_LTLIBRARIES = libbtfi.la libbtfl.la -+ -+libbtfi_la_SOURCES = $(BTFSRC) -+ -+libbtfl_la_SOURCES = $(BTFSRC) -+libbtfl_la_CPPFLAGS = $(AM_CPPFLAGS) -DDLONG -+ -+libbtf_la_SOURCES = -+libbtf_la_LIBADD = libbtfi.la libbtfl.la -+libbtf_la_LDFLAGS = -no-undefined -release $(PACKAGE_VERSION) -diff --git a/btf.pc.in b/btf.pc.in -new file mode 100644 ---- /dev/null -+++ b/btf.pc.in -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: @PACKAGE_NAME@ -+Description: Permutation to block triangular form -+Version: @PACKAGE_VERSION@ -+URL: @PACKAGE_URL@ -+Requires.private: suitesparseconfig -+Libs: -L${libdir} -lbtf -+Cflags: -I${includedir}/btf -diff --git a/configure.ac b/configure.ac -new file mode 100644 ---- /dev/null -+++ b/configure.ac -@@ -0,0 +1,32 @@ -+# -*- Autoconf -*- -+# Process this file with autoconf to produce a configure script. -+ -+AC_PREREQ([2.69]) -+AC_INIT([BTF],[1.2.1],[DrTimothyAldenDavis@gmail.com],[btf],[http://www.suitesparse.com/]) -+AC_CONFIG_SRCDIR([Source/btf_order.c]) -+AC_CONFIG_HEADERS([config.h]) -+AM_INIT_AUTOMAKE([foreign]) -+LT_INIT -+ -+# Checks for programs. -+AC_PROG_INSTALL -+AC_PROG_CC -+ -+# Checks for libraries. -+PKG_PROG_PKG_CONFIG -+PKG_CHECK_MODULES([SUITESPARSECONFIG],[suitesparseconfig], -+ [], -+ [AC_MSG_ERROR([cannot find suitesparseconfig])]) -+ -+# Checks for header files. -+ -+# Checks for typedefs, structures, and compiler characteristics. -+ -+# Checks for library functions. -+ -+AC_CONFIG_FILES([ -+ btf.pc -+ Makefile -+ Include/Makefile -+ Source/Makefile]) -+AC_OUTPUT diff --git a/academic/btf/btf.SlackBuild b/academic/btf/btf.SlackBuild index 46474fcfcd..28a4d594d7 100644 --- a/academic/btf/btf.SlackBuild +++ b/academic/btf/btf.SlackBuild @@ -25,14 +25,14 @@ PRGNAM=btf SRCNAM=SuiteSparse SUBDIR=BTF -VERSION=${VERSION:-1.2.1} -SRCVER=${SRCVER:-4.4.6} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.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,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/btf/btf.info b/academic/btf/btf.info index e43df4c060..09ba6eb1da 100644 --- a/academic/btf/btf.info +++ b/academic/btf/btf.info @@ -1,8 +1,8 @@ PRGNAM="btf" -VERSION="1.2.1" +VERSION="1.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/btf/patches/autotoolize.diff b/academic/btf/patches/autotoolize.diff new file mode 100644 index 0000000000..bf0bfd6da6 --- /dev/null +++ b/academic/btf/patches/autotoolize.diff @@ -0,0 +1,93 @@ +diff --git a/Include/Makefile.am b/Include/Makefile.am +new file mode 100644 +--- /dev/null ++++ b/Include/Makefile.am +@@ -0,0 +1,2 @@ ++pkginclude_HEADERS = btf.h ++noinst_HEADERS = btf_internal.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 ++EXTRA_DIST = README.txt Doc/ChangeLog Doc/License.txt Doc/lesser.txt ++ ++pkgconfig_DATA = btf.pc +diff --git a/Source/Makefile.am b/Source/Makefile.am +new file mode 100644 +--- /dev/null ++++ b/Source/Makefile.am +@@ -0,0 +1,18 @@ ++AM_CPPFLAGS = -I$(top_srcdir)/Include $(SUITESPARSECONFIG_CFLAGS) ++ ++BTFSRC = \ ++ btf_maxtrans.c \ ++ btf_order.c \ ++ btf_strongcomp.c ++ ++lib_LTLIBRARIES = libbtf.la ++noinst_LTLIBRARIES = libbtfi.la libbtfl.la ++ ++libbtfi_la_SOURCES = $(BTFSRC) ++ ++libbtfl_la_SOURCES = $(BTFSRC) ++libbtfl_la_CPPFLAGS = $(AM_CPPFLAGS) -DDLONG ++ ++libbtf_la_SOURCES = ++libbtf_la_LIBADD = libbtfi.la libbtfl.la ++libbtf_la_LDFLAGS = -no-undefined -release $(PACKAGE_VERSION) +diff --git a/btf.pc.in b/btf.pc.in +new file mode 100644 +--- /dev/null ++++ b/btf.pc.in +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: @PACKAGE_NAME@ ++Description: Permutation to block triangular form ++Version: @PACKAGE_VERSION@ ++URL: @PACKAGE_URL@ ++Requires.private: suitesparseconfig ++Libs: -L${libdir} -lbtf ++Cflags: -I${includedir}/btf +diff --git a/configure.ac b/configure.ac +new file mode 100644 +--- /dev/null ++++ b/configure.ac +@@ -0,0 +1,32 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ([2.69]) ++AC_INIT([BTF],[1.2.6],[DrTimothyAldenDavis@gmail.com],[btf],[http://www.suitesparse.com/]) ++AC_CONFIG_SRCDIR([Source/btf_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 ++ ++# Checks for libraries. ++PKG_CHECK_MODULES([SUITESPARSECONFIG], [suitesparseconfig]) ++ ++# Checks for header files. ++ ++# Checks for typedefs, structures, and compiler characteristics. ++ ++# Checks for library functions. ++ ++PKG_INSTALLDIR ++AC_CONFIG_FILES([ ++ btf.pc ++ Makefile ++ Include/Makefile ++ Source/Makefile ++]) ++AC_OUTPUT -- cgit v1.2.3