exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed compile on darwin13 for bumped metis, scotch, parmetis

Browse source
This commit is contained in:
Dominik Christ 2013-11-26 17:57:42 +00:00
parent 33f70d6028
commit 049397bd3b
6 changed files with 124 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
ThirdParty/rpmBuild/SOURCES/metis-5.1.0_patch_darwin vendored Normal file
View file

@ -0,0 +1,89 @@
--- metis-5.1.0/GKlib/Makefile 2007-03-27 17:34:29.000000000 -0400
+++ metis-5.1.0/GKlib/Makefile 2010-10-26 01:02:24.000000000 -0400
@@ -55,6 +55,23 @@
LIBEXT = .lib
EXEEXT = .exe
else
+
+ #-------------------------------------------------------------------
+ # These defs are common among the GNU/GCC based systems
+ #-------------------------------------------------------------------
+ #Library creation information
+ AR = ar crv $@
+ RANLIB = ar -ts $@
+
+ #Compile input/output file specification
+ SOURCEFILE = -c $<
+ OUTPUTFILE = -o $@
+
+ # Standard file extensions
+ OBJEXT = .o
+ LIBEXT = .a
+ EXEEXT =
+
ifeq ($(systype),Linux)
ifeq ($(x86compiler),gcc)
#Compiler information
@@ -86,7 +103,7 @@
ifeq ($(systype),Darwin)
#Compiler information
CC = gcc
- OPTFLAGS = -O6
+ OPTFLAGS = -O3 -shared
COPTIONS = -DDARWIN -D_FILE_OFFSET_BITS=64 -Wall -std=c99 -pedantic
#Linker information
@@ -95,7 +112,11 @@
#Linker information
LDOPTIONS =
- LD = gcc
+ #LD = gcc
+ AR = gcc -shared -dynamiclib -undefined dynamic_lookup -o $@
+ LD = $(CC) -dynamiclib -undefined dynamic_lookup
+ RANLIB =
+ LIBEXT = .dylib
endif
@@ -121,22 +142,6 @@
LD = gcc
endif
-
- #-------------------------------------------------------------------
- # These defs are common among the GNU/GCC based systems
- #-------------------------------------------------------------------
- #Library creation information
- AR = ar crv $@
- RANLIB = ar -ts $@
-
- #Compile input/output file specification
- SOURCEFILE = -c $<
- OUTPUTFILE = -o $@
-
- # Standard file extensions
- OBJEXT = .o
- LIBEXT = .a
- EXEEXT =
endif
diff -uNr metis-5.0pre2/Makefile.in metis-5.0pre2_patch/Makefile.in
--- metis-5.0pre2/Makefile.in 2007-04-08 00:01:04.000000000 -0400
+++ metis-5.0pre2_patch/Makefile.in 2010-10-26 01:01:50.000000000 -0400
@@ -105,8 +105,12 @@
ifeq ($(systype),Darwin)
#Compiler information
CC = gcc
- OPTFLAGS = -O6
- COPTIONS += -DDARWINPPC
+ OPTFLAGS = -O3 -shared
+ COPTIONS += -DDARWIN
+ AR = gcc -shared -dynamiclib -undefined dynamic_lookup -o $@
+ LD = $(CC) -dynamiclib -undefined dynamic_lookup
+ RANLIB =
+ LIBEXT = .dylib
endif
ifeq ($(systype),CYGWIN)

4
ThirdParty/rpmBuild/SOURCES/scotch-6.0.0_patch_0 vendored
View file

@ -1,6 +1,6 @@
diff -ruN scotch_5.1.10b_orig/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib scotch_5.1.10b/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib diff -ruN scotch_5.1.10b_orig/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib scotch_5.1.10b/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib
--- scotch_5.1.10b_orig/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib 1969-12-31 19:00:00.000000000 -0500 --- scotch_6.0.0/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib 1969-12-31 19:00:00.000000000 -0500
+++ scotch_5.1.10b/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib 2010-10-31 15:44:58.000000000 -0400 +++ scotch_6.0.0/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib 2010-10-31 15:44:58.000000000 -0400
@@ -0,0 +1,22 @@ @@ -0,0 +1,22 @@
+EXE = +EXE =
+LIB = .dylib +LIB = .dylib

25
ThirdParty/rpmBuild/SOURCES/scotch-6.0.0_patch_darwin vendored Normal file
View file

@ -0,0 +1,25 @@
--- scotch_6.0.0_orig/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib 1970-01-01 01:00:00.000000000 +0100
+++ scotch_6.0.0/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib 2013-11-26 17:28:43.000000000 +0000
@@ -0,0 +1,22 @@
+EXE =
+LIB = .dylib
+OBJ = .o
+
+MAKE = make
+AR = gcc
+ARFLAGS = -shared -dynamiclib -undefined dynamic_lookup -o
+CAT = cat
+CCS = gcc
+CCP = mpicc
+CCD = mpicc
+CFLAGS = -O3 -Destrict=__restrict -DCOMMON_RANDOM_FIXED_SEED -DCOMMON_TIMING_OLD -DCOMMON_FILE_COMPRESS_GZ -DSCOTCH_RENAME
+CLIBFLAGS =
+LDFLAGS = -lz -lm
+LIBLDFLAGS = -dynamiclib -undefined dynamic_lookup
+CP = cp
+LEX = flex
+LN = ln
+MKDIR = mkdir
+MV = mv
+RANLIB = ranlib
+YACC = bison -y

4
ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec vendored
View file

@ -77,7 +77,7 @@ URL: http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis
Source: %url/%{name}-%{version}.tar.gz Source: %url/%{name}-%{version}.tar.gz
Prefix: %{_prefix} Prefix: %{_prefix}
Group: Development/Tools Group: Development/Tools
Patch0: metis-5.0pre2_patch_darwin Patch0: metis-5.1.0_patch_darwin
%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS} %define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
@ -88,7 +88,7 @@ Patch0: metis-5.0pre2_patch_darwin
%setup -q %setup -q
%ifos darwin %ifos darwin
%patch0 -p1 #%patch0 -p1
%endif %endif
%build %build

2
ThirdParty/rpmBuild/SPECS/parmetis-4.0.3.spec vendored
View file

@ -89,7 +89,7 @@ Patch1: ParMetis-3.1.1.patch
%setup -q %setup -q
%ifos darwin %ifos darwin
%patch0 -p1 #%patch0 -p1
#%else #%else
#patch1 -p1 #patch1 -p1
%endif %endif

5
ThirdParty/rpmBuild/SPECS/scotch-6.0.0.spec vendored
View file

@ -78,6 +78,7 @@ Source: %url/%{name}-%{version}.tar.gz
Prefix: %{_prefix} Prefix: %{_prefix}
Group: Development/Tools Group: Development/Tools
Patch0: scotch-6.0.0_patch_0 Patch0: scotch-6.0.0_patch_0
Patch1: scotch-6.0.0_patch_darwin
%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS} %define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
@ -87,7 +88,11 @@ Patch0: scotch-6.0.0_patch_0
%prep %prep
%setup -q -n %{name}_%{version} %setup -q -n %{name}_%{version}
%ifos darwin
%patch1 -p1
%else
%patch0 -p1 %patch0 -p1
%endif
%build %build
# export WM settings in a form that GNU configure recognizes # export WM settings in a form that GNU configure recognizes