ThirdParty: fix compilation of ParMetis 3.1.1 on Mac OS X

This commit is contained in:
Martin Beaudoin 2012-05-10 00:15:37 -04:00
parent 0ee9ddb2b2
commit bb4cc6905f

View file

@ -1,6 +1,6 @@
diff -ruN ParMetis-3.1.1_orig/METISLib/Makefile ParMetis-3.1.1/METISLib/Makefile diff -ruN ParMetis-3.1.1_orig/METISLib/Makefile ParMetis-3.1.1/METISLib/Makefile
--- ParMetis-3.1.1_orig/METISLib/Makefile 2007-03-19 13:46:34.000000000 -0400 --- ParMetis-3.1.1_orig/METISLib/Makefile 2007-03-19 13:46:34.000000000 -0400
+++ ParMetis-3.1.1/METISLib/Makefile 2010-10-31 17:13:46.000000000 -0400 +++ ParMetis-3.1.1/METISLib/Makefile 2011-12-24 15:06:49.000000000 -0500
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
.c.o: .c.o:
$(CC) $(CFLAGS) -c $*.c $(CC) $(CFLAGS) -c $*.c
@ -19,10 +19,9 @@ diff -ruN ParMetis-3.1.1_orig/METISLib/Makefile ParMetis-3.1.1/METISLib/Makefile
checkin: checkin:
Binary files ParMetis-3.1.1_orig/METISLib/libmetis-parmetis.dylib and ParMetis-3.1.1/METISLib/libmetis-parmetis.dylib differ
diff -ruN ParMetis-3.1.1_orig/Makefile.in ParMetis-3.1.1/Makefile.in diff -ruN ParMetis-3.1.1_orig/Makefile.in ParMetis-3.1.1/Makefile.in
--- ParMetis-3.1.1_orig/Makefile.in 2008-11-17 18:47:06.000000000 -0500 --- ParMetis-3.1.1_orig/Makefile.in 2008-11-17 18:47:06.000000000 -0500
+++ ParMetis-3.1.1/Makefile.in 2010-10-31 17:20:54.000000000 -0400 +++ ParMetis-3.1.1/Makefile.in 2011-12-24 15:06:49.000000000 -0500
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
INCDIR = INCDIR =
@ -51,7 +50,7 @@ diff -ruN ParMetis-3.1.1_orig/Makefile.in ParMetis-3.1.1/Makefile.in
VERNUM = VERNUM =
diff -ruN ParMetis-3.1.1_orig/ParMETISLib/Makefile ParMetis-3.1.1/ParMETISLib/Makefile diff -ruN ParMetis-3.1.1_orig/ParMETISLib/Makefile ParMetis-3.1.1/ParMETISLib/Makefile
--- ParMetis-3.1.1_orig/ParMETISLib/Makefile 2008-11-17 17:43:23.000000000 -0500 --- ParMetis-3.1.1_orig/ParMETISLib/Makefile 2008-11-17 17:43:23.000000000 -0500
+++ ParMetis-3.1.1/ParMETISLib/Makefile 2010-10-31 17:13:46.000000000 -0400 +++ ParMetis-3.1.1/ParMETISLib/Makefile 2011-12-24 15:06:49.000000000 -0500
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
$(CC) $(CFLAGS) -c $*.c $(CC) $(CFLAGS) -c $*.c
@ -70,10 +69,24 @@ diff -ruN ParMetis-3.1.1_orig/ParMETISLib/Makefile ParMetis-3.1.1/ParMETISLib/Ma
checkin: checkin:
Binary files ParMetis-3.1.1_orig/ParMETISLib/libparmetis.dylib and ParMetis-3.1.1/ParMETISLib/libparmetis.dylib differ diff -ruN ParMetis-3.1.1_orig/ParMETISLib/stdheaders.h ParMetis-3.1.1/ParMETISLib/stdheaders.h
--- ParMetis-3.1.1_orig/ParMETISLib/stdheaders.h 2008-09-16 17:39:19.000000000 -0400
+++ ParMetis-3.1.1/ParMETISLib/stdheaders.h 2011-12-24 15:07:42.000000000 -0500
@@ -13,8 +13,11 @@
#include <stdio.h>
+#ifdef __STDC__
#include <stdlib.h>
+#else
#include <malloc.h>
+#endif
#include <string.h>
#include <ctype.h>
#include <math.h>
diff -ruN ParMetis-3.1.1_orig/Programs/Makefile ParMetis-3.1.1/Programs/Makefile diff -ruN ParMetis-3.1.1_orig/Programs/Makefile ParMetis-3.1.1/Programs/Makefile
--- ParMetis-3.1.1_orig/Programs/Makefile 2008-11-17 18:47:06.000000000 -0500 --- ParMetis-3.1.1_orig/Programs/Makefile 2008-11-17 18:47:06.000000000 -0500
+++ ParMetis-3.1.1/Programs/Makefile 2010-10-31 17:13:46.000000000 -0400 +++ ParMetis-3.1.1/Programs/Makefile 2011-12-24 15:06:49.000000000 -0500
@@ -6,9 +6,9 @@ @@ -6,9 +6,9 @@
CFLAGS = $(COPTIONS) $(OPTFLAGS) $(INCLUDES) CFLAGS = $(COPTIONS) $(OPTFLAGS) $(INCLUDES)