ce2b0894c5
bumping hwloc to version 1.10.1
Adjusting libccmio for Mac OSX Yosemite
Adjustments for cmake 3.2.2
Adding spec file for openmpi version 1.8.4
44 lines
1.8 KiB
Text
44 lines
1.8 KiB
Text
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_6.0.0/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 2010-10-31 15:44:58.000000000 -0400
|
|
@@ -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 -fPIC -DCOMMON_TIMING_OLD -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_PTHREAD -DSCOTCH_RENAME
|
|
+LDFLAGS = -lz -lm
|
|
+LIBLDFLAGS = -dynamiclib -undefined dynamic_lookup
|
|
+CP = cp
|
|
+LEX = flex
|
|
+LN = ln
|
|
+MKDIR = mkdir
|
|
+MV = mv
|
|
+RANLIB = ranlib
|
|
+YACC = bison -y
|
|
diff -ruN scotch_5.1.10b_orig/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib scotch_5.1.10b/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib
|
|
--- scotch_5.1.10b_orig/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib 2010-08-07 00:02:42.000000000 -07
|
|
--- scotch_6.0.0_orig/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib 2011-09-06 17:46:49.000000000 +0100
|
|
+++ scotch_6.0.0/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib 2013-11-26 12:24:24.689990673 +0000
|
|
@@ -8,10 +8,10 @@
|
|
CAT = cat
|
|
CCS = gcc
|
|
CCP = mpicc
|
|
-CCD = gcc
|
|
-CFLAGS = -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict
|
|
+CCD = mpicc -I$(MPI_HOME)/include
|
|
+CFLAGS = -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -Xlinker --no-as-needed
|
|
CLIBFLAGS = -shared -fPIC
|
|
-LDFLAGS = -lz -lm -lrt
|
|
+LDFLAGS = -lpthread -lz -lm -lrt
|
|
CP = cp
|
|
LEX = flex -Pscotchyy -olex.yy.c
|
|
LN = ln
|