From 2783a26a3976ed77b67262a2711375e76b38e40a Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Tue, 9 Jun 2015 00:45:43 -0500 Subject: academic/metis: Fix potential linking problems. _LARGEFILE64_SOURCE should be unnecessary. _FILE_OFFSET_BITS=64 does the real work to link to the 64-bit functions. Don't abuse libtool's -version-info to make the library version match the package version. These do not necessarily correspond. Remove the .la files; these are causing libtool to overlink. This should save you from needlessly rebuilding some dependent packages in the future. Signed-off-by: Kyle Guinn --- academic/metis/autotoolize.diff | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'academic/metis/autotoolize.diff') diff --git a/academic/metis/autotoolize.diff b/academic/metis/autotoolize.diff index 1b87aa13c8..93c16ea6b3 100644 --- a/academic/metis/autotoolize.diff +++ b/academic/metis/autotoolize.diff @@ -4,7 +4,7 @@ new file mode 100644 +++ b/Doc/Makefile.am @@ -0,0 +1,5 @@ +dist_noinst_DATA = manual.ps -+pdf_DATA = manual.pdf ++dist_pdf_DATA = manual.pdf + +%.pdf: %.ps + ps2pdf $< @@ -80,14 +80,14 @@ new file mode 100644 +lib_LTLIBRARIES = libmetis.la +libmetis_la_SOURCES = $(SRC) +libmetis_la_LIBADD = -lm -+libmetis_la_LDFLAGS = -no-undefined -version-info 4:3:0 ++libmetis_la_LDFLAGS = -no-undefined -release $(PACKAGE_VERSION) diff --git a/Makefile.am b/Makefile.am new file mode 100644 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,5 @@ +SUBDIRS = Lib Programs Graphs Test Doc -+EXTRA_DIST = CHANGES FILES INSTALL LICENSE VERSION metis.pc.in ++EXTRA_DIST = CHANGES FILES INSTALL LICENSE VERSION + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = metis.pc @@ -139,23 +139,32 @@ diff --git a/configure.ac b/configure.ac new file mode 100644 --- /dev/null +++ b/configure.ac -@@ -0,0 +1,31 @@ -+AC_PREREQ([2.68]) -+AC_INIT([METIS],[4.0.3],[karypis@cs.umn.edu]) +@@ -0,0 +1,40 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ([2.69]) ++AC_INIT([METIS],[4.0.3],[karypis@cs.umn.edu],[metis],[http://glaros.dtc.umn.edu/gkhome/metis/metis/overview]) +AC_CONFIG_SRCDIR([Lib/metis.h]) -+AC_CONFIG_HEADER([config.h]) ++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([malloc.h stdlib.h string.h strings.h]) + ++# Checks for typedefs, structures, and compiler characteristics. ++ ++# Checks for library functions. +AC_FUNC_MALLOC +AC_FUNC_REALLOC +AC_CHECK_FUNCS([pow sqrt strtol]) @@ -175,7 +184,7 @@ diff --git a/metis.pc.in b/metis.pc.in new file mode 100644 --- /dev/null +++ b/metis.pc.in -@@ -0,0 +1,11 @@ +@@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ @@ -184,6 +193,7 @@ new file mode 100644 +Name: @PACKAGE_NAME@ +Description: Software for partitioning unstructured graphs and meshes +Version: @PACKAGE_VERSION@ ++URL: @PACKAGE_URL@ +Libs: -L${libdir} -lmetis +Libs.private: -lm +Cflags: -I${includedir}/metis -- cgit v1.2.3