summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien ROZO2011-08-26 12:08:44 +0200
committerJulien ROZO2011-08-26 12:14:25 +0200
commit6815624d20c403bb739567b2ddd265b7d3c7ea99 (patch)
tree2f7bd4344578249af72a3a638dd736cd715f3dcf
parentbd1957673dbedf866906a508c9fec1c0c2c6ebcf (diff)
metis: updated version to 5.0
added DEPENDS and cmake dependency removed obsolete PRE_BUILD, metis-4.0.1-gcc44.patch and metis-4.0.1-autotools.patch updated BUILD and INSTALL to use the new cmake process (cherry picked from commit f764f91ce79c128c27b012f34fd1ae218f4db2e3)
-rwxr-xr-xcluster/metis/BUILD1
-rwxr-xr-xcluster/metis/DEPENDS1
-rwxr-xr-xcluster/metis/DETAILS4
-rw-r--r--cluster/metis/HISTORY6
-rwxr-xr-xcluster/metis/INSTALL21
-rwxr-xr-xcluster/metis/PRE_BUILD4
-rw-r--r--cluster/metis/metis-4.0.1-autotools.patch85
-rw-r--r--cluster/metis/metis-4.0.1-gcc44.patch11
8 files changed, 12 insertions, 121 deletions
diff --git a/cluster/metis/BUILD b/cluster/metis/BUILD
index 8f58e6df93..17bb6c5fdf 100755
--- a/cluster/metis/BUILD
+++ b/cluster/metis/BUILD
@@ -1 +1,2 @@
+make config prefix=${INSTALL_ROOT}/usr &&
make
diff --git a/cluster/metis/DEPENDS b/cluster/metis/DEPENDS
new file mode 100755
index 0000000000..60dd6147cc
--- /dev/null
+++ b/cluster/metis/DEPENDS
@@ -0,0 +1 @@
+depends cmake
diff --git a/cluster/metis/DETAILS b/cluster/metis/DETAILS
index 25f6745452..9ebe8795d8 100755
--- a/cluster/metis/DETAILS
+++ b/cluster/metis/DETAILS
@@ -1,7 +1,7 @@
SPELL=metis
- VERSION=4.0
+ VERSION=5.0
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_HASH=sha512:002818c6e5510f95563a7a78bca4c08500c57f7cfdc0fe7e26415a830b19e7020454fafdee509acd319433d1fe8b25ba9e47b805b34ebd3a943ca39e7253db32
+ SOURCE_HASH=sha512:b992922bacb56c8c101b722ce7bfbdab0eb16035565c73548d6ed0e42068995ffa67b49b30801987a72cf6a99b95757b8913be095c824ea346aa44d53c16bcbc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://glaros.dtc.umn.edu/gkhome/fetch/sw/$SPELL/$SOURCE
LICENSE[0]=http://glaros.dtc.umn.edu/gkhome/metis/metis/faq?q=metis/metis/faq#distribute
diff --git a/cluster/metis/HISTORY b/cluster/metis/HISTORY
index 852898df3a..1499e90637 100644
--- a/cluster/metis/HISTORY
+++ b/cluster/metis/HISTORY
@@ -1,3 +1,9 @@
+2011-08-26 Julien "_kaze_" ROZO <julien@rozo.org>
+ * DETAILS: updated version to 5.0, fixed issue #90
+ * PRE_BUILD, metis-4.0.1-gcc44.patch, metis-4.0.1-autotools.patch:removed, obsolete
+ * DEPENDS: added, cmake is mandatory
+ * BUILD, INSTALL: updated to the new compilation and installation process
+
2010-04-27 Bor Kraljič <pyrobor@ver.si>
* PRE_BUILD: added patches form gentoo to compile
* metis-4.0.1-gcc44.patch: added for compile
diff --git a/cluster/metis/INSTALL b/cluster/metis/INSTALL
index 19a0c25409..47cca5d00e 100755
--- a/cluster/metis/INSTALL
+++ b/cluster/metis/INSTALL
@@ -1,20 +1,3 @@
-install -m 755 graphchk $INSTALL_ROOT/usr/bin &&
-install -m 755 kmetis $INSTALL_ROOT/usr/bin &&
-install -m 755 mesh2dual $INSTALL_ROOT/usr/bin &&
-install -m 755 mesh2nodal $INSTALL_ROOT/usr/bin &&
-install -m 755 oemetis $INSTALL_ROOT/usr/bin &&
-install -m 755 onmetis $INSTALL_ROOT/usr/bin &&
-install -m 755 partdmesh $INSTALL_ROOT/usr/bin &&
-install -m 755 partnmesh $INSTALL_ROOT/usr/bin &&
-install -m 755 pmetis $INSTALL_ROOT/usr/bin &&
-
-install -d $INSTALL_ROOT/usr/include/metis &&
-
-for file in `ls -1 Lib/*.h` ; do
- install -m 644 $file $INSTALL_ROOT/usr/include/metis
-done &&
-
-install -m 644 libmetis.a $INSTALL_ROOT/usr/lib &&
-
+default_install &&
install -d $INSTALL_ROOT/usr/doc/metis &&
-install -m 644 Doc/manual.ps $INSTALL_ROOT/usr/doc/metis
+install -m 644 $SOURCE_DIRECTORY/manual/manual.pdf $INSTALL_ROOT/usr/doc/metis
diff --git a/cluster/metis/PRE_BUILD b/cluster/metis/PRE_BUILD
deleted file mode 100755
index 3a491223ad..0000000000
--- a/cluster/metis/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-mk_source_dir $SOURCE_DIRECTORY &&
- unpack_file &&
-patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/metis-4.0.1-autotools.patch &&
-patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/metis-4.0.1-gcc44.patch
diff --git a/cluster/metis/metis-4.0.1-autotools.patch b/cluster/metis/metis-4.0.1-autotools.patch
deleted file mode 100644
index b9623dd9eb..0000000000
--- a/cluster/metis/metis-4.0.1-autotools.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ configure.ac 2008-03-25 10:05:57.090715324 +0000
-@@ -0,0 +1,15 @@
-+# -*- Autoconf -*-
-+AC_PREREQ(2.59)
-+AC_INIT(metis, 4.0.1, karypis@cs.umn.edu)
-+AM_INIT_AUTOMAKE([foreign])
-+AC_CONFIG_HEADER([config.h])
-+AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
-+AC_CHECK_LIB(m, sqrt)
-+AC_CONFIG_FILES([
-+ Makefile
-+ metis.pc
-+ Lib/Makefile
-+ Programs/Makefile\
-+ Test/Makefile])
-+AC_OUTPUT
---- metis.pc.in 1970-01-01 01:00:00.000000000 +0100
-+++ metis.pc.in 2008-02-15 14:45:09.378997263 +0000
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: METIS
-+Description: Software for partioning unstructured graphes and meshes
-+Version: @VERSION@
-+Libs: -L${libdir} -lmetis
-+Cflags: -I${includedir}/metis
---- Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ Makefile.am 2008-02-15 14:46:16.578826763 +0000
-@@ -0,0 +1,5 @@
-+SUBDIRS = Lib Programs Test
-+EXTRA_DIST = CHANGES VERSION metis.pc.in
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = metis.pc
---- Lib/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ Lib/Makefile.am 2008-03-25 10:06:10.719491984 +0000
-@@ -0,0 +1,15 @@
-+pkginclude_HEADERS = defs.h macros.h metis.h proto.h rename.h struct.h
-+pkgincludedir = $(includedir)/metis
-+lib_LTLIBRARIES = libmetis.la
-+libmetis_la_SOURCES = \
-+ coarsen.c fm.c initpart.c match.c ccgraph.c memory.c \
-+ pmetis.c pqueue.c refine.c util.c timing.c debug.c \
-+ bucketsort.c graph.c stat.c kmetis.c kwayrefine.c \
-+ kwayfm.c balance.c ometis.c srefine.c sfm.c separator.c \
-+ mincover.c mmd.c mesh.c meshpart.c frename.c fortran.c \
-+ myqsort.c compress.c parmetis.c estmem.c \
-+ mpmetis.c mcoarsen.c mmatch.c minitpart.c mbalance.c \
-+ mrefine.c mutil.c mfm.c mkmetis.c mkwayrefine.c mkwayfmh.c \
-+ mrefine2.c minitpart2.c mbalance2.c mfm2.c \
-+ kvmetis.c kwayvolrefine.c kwayvolfm.c subdomains.c
-+libmetis_la_LDFLAGS = -no-undefined -version-info 4:0:0
---- Programs/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ Programs/Makefile.am 2008-01-31 12:00:14.981124649 +0000
-@@ -0,0 +1,15 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Lib
-+LDADD = $(top_builddir)/Lib/libmetis.la -lm
-+
-+bin_PROGRAMS = pmetis kmetis oemetis onmetis mesh2dual mesh2nodal \
-+ partdmesh partnmesh graphchk
-+
-+pmetis_SOURCES = pmetis.c io.c
-+kmetis_SOURCES = kmetis.c io.c
-+oemetis_SOURCES = oemetis.c io.c smbfactor.c
-+onmetis_SOURCES = onmetis.c io.c smbfactor.c
-+mesh2dual_SOURCES = mesh2dual.c io.c
-+mesh2nodal_SOURCES = mesh2nodal.c io.c
-+partdmesh_SOURCES = partdmesh.c io.c
-+partnmesh_SOURCES = partnmesh.c io.c
-+graphchk_SOURCES = graphchk.c io.c
---- Test/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ Test/Makefile.am 2008-01-31 12:37:59.532517099 +0000
-@@ -0,0 +1,7 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Lib
-+LDADD = $(top_builddir)/Lib/libmetis.la -lm
-+check_PROGRAMS = mtest
-+mtest_SOURCES = mtest.c ../Programs/io.c
-+
-+check-local: $(check_PROGRAMS)
-+ - ./mtest ../Graphs/4elt.graph
diff --git a/cluster/metis/metis-4.0.1-gcc44.patch b/cluster/metis/metis-4.0.1-gcc44.patch
deleted file mode 100644
index fc55499380..0000000000
--- a/cluster/metis/metis-4.0.1-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- metis-4.0.orig/Lib/rename.h 1998-11-30 08:26:50.000000000 -0800
-+++ metis-4.0/Lib/rename.h 2009-05-26 00:18:27.000000000 -0700
-@@ -410,7 +410,7 @@
- #define RandomPermute __RandomPermute
- #define ispow2 __ispow2
- #define InitRandom __InitRandom
--#define log2 __log2
-+#define log2 ___log2
-
-
-