diff options
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/AMD/AMD.SlackBuild | 10 | ||||
| -rw-r--r-- | libraries/AMD/AMD.info | 6 | ||||
| -rw-r--r-- | libraries/AMD/autotoolize.diff | 54 |
3 files changed, 54 insertions, 16 deletions
diff --git a/libraries/AMD/AMD.SlackBuild b/libraries/AMD/AMD.SlackBuild index c677c09cac..989dfb9fe8 100644 --- a/libraries/AMD/AMD.SlackBuild +++ b/libraries/AMD/AMD.SlackBuild @@ -4,7 +4,7 @@ # Written by Kyle Guinn <elyk03@gmail.com> PRGNAM=AMD -VERSION=${VERSION:-2.2.1} +VERSION=${VERSION:-2.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -37,6 +37,9 @@ else LIBDIRSUFFIX="" fi +# Recommended by SuiteSparse +SLKCFLAGS="$SLKCFLAGS -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" + set -e rm -rf $PKG @@ -52,14 +55,17 @@ patch -p1 < $CWD/autotoolize.diff autoreconf -vif CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +FFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ + --infodir=/usr/info \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --enable-shared \ + --disable-static \ --build=$ARCH-slackware-linux make diff --git a/libraries/AMD/AMD.info b/libraries/AMD/AMD.info index dbfbb1598e..78174bcc05 100644 --- a/libraries/AMD/AMD.info +++ b/libraries/AMD/AMD.info @@ -1,8 +1,8 @@ PRGNAM="AMD" -VERSION="2.2.1" +VERSION="2.2.2" HOMEPAGE="http://www.cise.ufl.edu/research/sparse/amd/" -DOWNLOAD="http://www.cise.ufl.edu/research/sparse/amd/AMD-2.2.1.tar.gz" -MD5SUM="b3e9679ba20635ac4847f01c01d6e992" +DOWNLOAD="http://www.cise.ufl.edu/research/sparse/amd/AMD-2.2.2.tar.gz" +MD5SUM="76b870aaf5c98eb34579467dfed38b19" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Kyle Guinn" diff --git a/libraries/AMD/autotoolize.diff b/libraries/AMD/autotoolize.diff index 1bc7eeefec..2b83e03f0d 100644 --- a/libraries/AMD/autotoolize.diff +++ b/libraries/AMD/autotoolize.diff @@ -3,7 +3,7 @@ new file mode 100644 --- /dev/null +++ b/Demo/Makefile.am @@ -0,0 +1,54 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/Include ++AM_CPPFLAGS = -I$(top_srcdir)/Include $(UFCONFIG_CFLAGS) +LDADD = $(top_builddir)/Source/libamd.la + +EXTRA_DIST = \ @@ -75,20 +75,29 @@ new file mode 100644 + +clean-local: + -$(RM) *.aux *.bbl *.blg *.log *.toc +diff --git a/Include/Makefile.am b/Include/Makefile.am +new file mode 100644 +--- /dev/null ++++ b/Include/Makefile.am +@@ -0,0 +1,2 @@ ++pkgincludedir = $(includedir)/amd ++pkginclude_HEADERS = amd.h amd_internal.h diff --git a/Makefile.am b/Makefile.am new file mode 100644 --- /dev/null +++ b/Makefile.am -@@ -0,0 +1,3 @@ -+SUBDIRS = Source Demo Doc +@@ -0,0 +1,5 @@ ++SUBDIRS = Include Source Demo Doc +EXTRA_DIST = README.txt -+include_HEADERS = Include/amd.h Include/amd_internal.h ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = amd.pc diff --git a/Source/Makefile.am b/Source/Makefile.am new file mode 100644 --- /dev/null +++ b/Source/Makefile.am @@ -0,0 +1,33 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/Include ++AM_CPPFLAGS = -I$(top_srcdir)/Include $(UFCONFIG_CFLAGS) + +AMDSRC = \ + amd_1.c \ @@ -117,17 +126,34 @@ new file mode 100644 + +libamd_la_SOURCES = amd_global.c +libamd_la_LIBADD = libamdl.la libamdi.la -+libamd_la_LDFLAGS = -no-undefined -version-info 4:1:2 ++libamd_la_LDFLAGS = -no-undefined -version-info 4:2:2 + +libamdf77_la_SOURCES = amd.f amdbar.f -+libamdf77_la_LDFLAGS = -no-undefined -version-info 4:1:2 ++libamdf77_la_LDFLAGS = -no-undefined -version-info 4:2:2 +diff --git a/amd.pc.in b/amd.pc.in +new file mode 100644 +--- /dev/null ++++ b/amd.pc.in +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: @PACKAGE_NAME@ ++Description: Approximate minimum degree ordering ++Version: @PACKAGE_VERSION@ ++Requires.private: ufconfig ++Libs: -L${libdir} -lamd ++Libs.private: -lm ++Cflags: -I${includedir}/amd diff --git a/configure.ac b/configure.ac new file mode 100644 --- /dev/null +++ b/configure.ac -@@ -0,0 +1,30 @@ -+AC_PREREQ([2.65]) -+AC_INIT([AMD], [2.2.1], [davis@cise.ufl.edu]) +@@ -0,0 +1,36 @@ ++AC_PREREQ([2.68]) ++AC_INIT([AMD],[2.2.2],[davis@cise.ufl.edu]) +AC_CONFIG_SRCDIR([Source/amd_global.c]) +AC_CONFIG_HEADER([config.h]) +AM_INIT_AUTOMAKE([foreign]) @@ -142,7 +168,11 @@ new file mode 100644 +AC_CHECK_LIB([m], [sqrt]) + +AC_CHECK_HEADERS([limits.h stddef.h stdlib.h]) -+AC_CHECK_HEADERS([UFconfig.h]) ++ ++PKG_PROG_PKG_CONFIG ++PKG_CHECK_MODULES([UFCONFIG],[ufconfig], ++ [], ++ [AC_MSG_ERROR([cannot find ufconfig])]) + +AC_TYPE_SIZE_T + @@ -151,8 +181,10 @@ new file mode 100644 +LIBS=$LIBS_SAVED + +AC_CONFIG_FILES([ ++ amd.pc + Makefile + Demo/Makefile + Doc/Makefile ++ Include/Makefile + Source/Makefile]) +AC_OUTPUT |