From 19e5ed07718e087d08d5f8afbb537e61e95dba7c Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Sat, 28 Jan 2012 16:11:16 -0500 Subject: [PATCH] Modifications for Mac OS X Lion --- .../SOURCES/ParMGridGen-1.0.patch_darwin | 48 +++++++++++++++---- .../SOURCES/ParMetis-3.1.1.patch_darwin | 25 +++++++--- .../rpmBuild/SOURCES/libccmio-2.6.1.patch_0 | 8 +++- ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec | 1 + 4 files changed, 65 insertions(+), 17 deletions(-) diff --git a/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_darwin b/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_darwin index 264f9784a..29a9db97c 100644 --- a/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_darwin +++ b/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_darwin @@ -1,6 +1,18 @@ +diff -ruN ParMGridGen-1.0_orig/MGridGen/IMlib/IMlib.h ParMGridGen-1.0/MGridGen/IMlib/IMlib.h +--- ParMGridGen-1.0_orig/MGridGen/IMlib/IMlib.h 2001-11-08 18:41:25.000000000 -0500 ++++ ParMGridGen-1.0/MGridGen/IMlib/IMlib.h 2011-12-24 13:46:41.000000000 -0500 +@@ -43,7 +43,7 @@ + #ifdef DMALLOC + #include + #else +-#include ++#include + #endif + + /************************************************************************* diff -ruN ParMGridGen-1.0_orig/MGridGen/IMlib/Makefile ParMGridGen-1.0/MGridGen/IMlib/Makefile --- ParMGridGen-1.0_orig/MGridGen/IMlib/Makefile 2001-12-04 17:46:56.000000000 -0500 -+++ ParMGridGen-1.0/MGridGen/IMlib/Makefile 2010-10-31 17:29:25.000000000 -0400 ++++ ParMGridGen-1.0/MGridGen/IMlib/Makefile 2011-12-24 13:24:17.000000000 -0500 @@ -33,7 +33,7 @@ .c.o: $(CC) $(CFLAGS) -c $*.c @@ -16,10 +28,9 @@ diff -ruN ParMGridGen-1.0_orig/MGridGen/IMlib/Makefile ParMGridGen-1.0/MGridGen/ realclean: - rm -f *.o ; rm -f ./libIMlib.a + rm -f *.o ; rm -f ./libIMlib.$(LIBEXT) -Binary files ParMGridGen-1.0_orig/MGridGen/IMlib/libIMlib.dylib and ParMGridGen-1.0/MGridGen/IMlib/libIMlib.dylib differ diff -ruN ParMGridGen-1.0_orig/MGridGen/Lib/Makefile ParMGridGen-1.0/MGridGen/Lib/Makefile --- ParMGridGen-1.0_orig/MGridGen/Lib/Makefile 2001-12-04 18:01:00.000000000 -0500 -+++ ParMGridGen-1.0/MGridGen/Lib/Makefile 2010-10-31 17:29:25.000000000 -0400 ++++ ParMGridGen-1.0/MGridGen/Lib/Makefile 2011-12-24 13:24:17.000000000 -0500 @@ -22,7 +22,7 @@ INCLUDES = -I./ -I$(IMLIBDIR) $(INCDIR) CFLAGS = $(COPTIONS) $(OPTFLAGS) $(DEBUGFLAGS) $(INCLUDES) @@ -44,10 +55,21 @@ diff -ruN ParMGridGen-1.0_orig/MGridGen/Lib/Makefile ParMGridGen-1.0/MGridGen/Li realclean: - rm -f *.o ; rm -f ../../libmgrid.a + rm -f *.o ; rm -f ./libMGridGen.$(LIBEXT) -Binary files ParMGridGen-1.0_orig/MGridGen/Lib/libMGridGen.dylib and ParMGridGen-1.0/MGridGen/Lib/libMGridGen.dylib differ +diff -ruN ParMGridGen-1.0_orig/MGridGen/Lib/mgridgen.h ParMGridGen-1.0/MGridGen/Lib/mgridgen.h +--- ParMGridGen-1.0_orig/MGridGen/Lib/mgridgen.h 2001-11-08 18:41:25.000000000 -0500 ++++ ParMGridGen-1.0/MGridGen/Lib/mgridgen.h 2011-12-24 13:48:18.000000000 -0500 +@@ -26,7 +26,7 @@ + #ifdef DMALLOC + #include + #else +-#include ++#include + #endif + + #include "defs.h" diff -ruN ParMGridGen-1.0_orig/MGridGen/Programs/Makefile ParMGridGen-1.0/MGridGen/Programs/Makefile --- ParMGridGen-1.0_orig/MGridGen/Programs/Makefile 2001-12-04 18:02:26.000000000 -0500 -+++ ParMGridGen-1.0/MGridGen/Programs/Makefile 2010-10-31 17:29:25.000000000 -0400 ++++ ParMGridGen-1.0/MGridGen/Programs/Makefile 2011-12-24 13:24:17.000000000 -0500 @@ -1,6 +1,6 @@ include ../../Makefile.in @@ -57,8 +79,16 @@ diff -ruN ParMGridGen-1.0_orig/MGridGen/Programs/Makefile ParMGridGen-1.0/MGridG ifeq ($(ddmalloc),yes) DEBUGFLAGS := $(DEBUGFLAGS) -DDMALLOC -DDEBUG diff -ruN ParMGridGen-1.0_orig/Makefile.in ParMGridGen-1.0/Makefile.in ---- ParMGridGen-1.0_orig/Makefile.in 2001-12-04 19:30:33.000000000 -0500 -+++ ParMGridGen-1.0/Makefile.in 2010-10-31 17:30:58.000000000 -0400 +--- ParMGridGen-1.0_orig/Makefile.in 2011-12-24 13:54:44.000000000 -0500 ++++ ParMGridGen-1.0/Makefile.in 2011-12-24 13:49:26.000000000 -0500 +@@ -1,6 +1,6 @@ + #-------------------------------------------------------------------------- + # Which make to use +-make = gmake ++make = make + + # Which compiler to use + # CC is the compiler for the serial code @@ -12,7 +12,7 @@ OPTFLAGS = -O3 @@ -72,8 +102,9 @@ diff -ruN ParMGridGen-1.0_orig/Makefile.in ParMGridGen-1.0/Makefile.in # In which directories to look for any additional libraries LIBDIR = -L../.. \ +- -L/usr/lib32/ + -L../Lib \ - -L/usr/lib32/ ++ -L/usr/lib/ # Set some flags DEBUGFLAGS = @@ -98,4 +129,3 @@ diff -ruN ParMGridGen-1.0_orig/Makefile.in ParMGridGen-1.0/Makefile.in #-------------------------------------------------------------------------- # -Binary files ParMGridGen-1.0_orig/mgridgen and ParMGridGen-1.0/mgridgen differ diff --git a/ThirdParty/rpmBuild/SOURCES/ParMetis-3.1.1.patch_darwin b/ThirdParty/rpmBuild/SOURCES/ParMetis-3.1.1.patch_darwin index 0b4349e44..a6ff2d775 100644 --- a/ThirdParty/rpmBuild/SOURCES/ParMetis-3.1.1.patch_darwin +++ b/ThirdParty/rpmBuild/SOURCES/ParMetis-3.1.1.patch_darwin @@ -1,6 +1,6 @@ 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/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 @@ .c.o: $(CC) $(CFLAGS) -c $*.c @@ -19,10 +19,9 @@ diff -ruN ParMetis-3.1.1_orig/METISLib/Makefile ParMetis-3.1.1/METISLib/Makefile 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 --- 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 @@ INCDIR = @@ -51,7 +50,7 @@ diff -ruN ParMetis-3.1.1_orig/Makefile.in ParMetis-3.1.1/Makefile.in VERNUM = 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/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 @@ $(CC) $(CFLAGS) -c $*.c @@ -70,10 +69,24 @@ diff -ruN ParMetis-3.1.1_orig/ParMETISLib/Makefile ParMetis-3.1.1/ParMETISLib/Ma 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 ++#ifdef __STDC__ + #include ++#else + #include ++#endif + #include + #include + #include 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/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 @@ CFLAGS = $(COPTIONS) $(OPTFLAGS) $(INCLUDES) diff --git a/ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 b/ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 index 1a1285b1a..c773ca8bf 100644 --- a/ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 +++ b/ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 @@ -7,11 +7,12 @@ diff -ruN libccmio-2.6.1_orig/config/config.gnu.to.star libccmio-2.6.1/config/co # $Id: config.gnu.to.star,v 1.4 2006/06/05 21:12:16 geoffp Exp $ -@@ -34,6 +34,7 @@ +@@ -34,6 +34,8 @@ x86_64-unknown-linux-gnu-null) echo linux64_2.4-x86-glibc_2.2.5 ;; ppc64-unknown-linux-gnu-null) echo linux64_2.6-pwr4-glibc_2.3.3 ;; i386-apple-darwin8-null) echo i386-apple-darwin8 ;; + i386-apple-darwin10-null) echo i386-apple-darwin10 ;; ++ i386-apple-darwin11-null) echo i386-apple-darwin11 ;; *) echo unknown ;; esac @@ -33,12 +34,15 @@ diff -ruN libccmio-2.6.1_orig/config/config.system libccmio-2.6.1/config/config. # $Id: config.system,v 1.2 2005/09/29 22:19:19 geoffp Exp $ -@@ -87,6 +87,9 @@ +@@ -87,6 +87,12 @@ i386-apple-darwin8.11.1) echo i386-apple-darwin8 ;; + i386-apple-darwin10.5.0 | i386-apple-darwin10.7.0 | i386-apple-darwin10.8.0) + echo i386-apple-darwin10 ;; ++ ++ i386-apple-darwin11.2.0 ) ++ echo i386-apple-darwin11 ;; + *) echo unknown diff --git a/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec b/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec index dac587b5c..71fc4af3a 100644 --- a/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec +++ b/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec @@ -99,6 +99,7 @@ Patch0: libccmio-2.6.1.patch_0 %ifos darwin # Missing configuration for Mac OS X 10 [ ! -d configi386-apple-darwin10 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin10 + [ ! -d configi386-apple-darwin11 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin11 %endif # Warning: # 1: The name of the ADF library will be renamed to libadf_ccmio since this