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

Bumped scotch to 6.0.0

Browse source
This commit is contained in:
Dominik Christ 2013-11-26 13:14:26 +00:00
parent eafe626e71
commit 5e15415b92
2 changed files with 45 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,144 +1,44 @@
diff -ur scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.i686_pc_linux2 scotch_6.0.0/src/Make.inc/Makefile.inc.i686_pc_linux2
--- scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.i686_pc_linux2 2013-11-26 01:39:06.886926953 +0100
+++ scotch_6.0.0/src/Make.inc/Makefile.inc.i686_pc_linux2 2013-11-26 02:01:19.338891116 +0100
@@ -11,7 +11,7 @@
CCD = gcc
CFLAGS = -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict
CLIBFLAGS =
-LDFLAGS = -lz -lm -lrt
+LDFLAGS = -Xlinker --add-needed -Xlinker --no-as-needed -lz -lm -lrt
CP = cp
LEX = flex -Pscotchyy -olex.yy.c
LN = ln
diff -ur scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.i686_pc_linux2.c99 scotch_6.0.0/src/Make.inc/Makefile.inc.i686_pc_linux2.c99
--- scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.i686_pc_linux2.c99 2013-11-26 01:39:06.886926953 +0100
+++ scotch_6.0.0/src/Make.inc/Makefile.inc.i686_pc_linux2.c99 2013-11-26 02:01:19.338891116 +0100
@@ -11,7 +11,7 @@
CCD = gcc
CFLAGS = -std=c99 -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER -DSCOTCH_PTHREAD
CLIBFLAGS =
-LDFLAGS = -lz -lm -lrt
+LDFLAGS = -Xlinker --add-needed -Xlinker --no-as-needed -lz -lm -lrt
CP = cp
LEX = flex -Pscotchyy -D_XOPEN_SOURCE=600 -olex.yy.c
LN = ln
diff -ur scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.i686_pc_linux2.debug scotch_6.0.0/src/Make.inc/Makefile.inc.i686_pc_linux2.debug
--- scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.i686_pc_linux2.debug 2013-11-26 01:39:06.890926953 +0100
+++ scotch_6.0.0/src/Make.inc/Makefile.inc.i686_pc_linux2.debug 2013-11-26 02:01:19.338891116 +0100
@@ -11,7 +11,7 @@
CCD = gcc
CFLAGS = -g -O0 -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DSCOTCH_DEBUG_ALL -DSCOTCH_DETERMINISTIC -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME
CLIBFLAGS =
-LDFLAGS = -g -lz -lm -lrt
+LDFLAGS = -g -Xlinker --add-needed -Xlinker --no-as-needed -lz -lm -lrt
CP = cp
LEX = flex -Pscotchyy -olex.yy.c
LN = ln
diff -ur scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.i686_pc_linux2.nothreads scotch_6.0.0/src/Make.inc/Makefile.inc.i686_pc_linux2.nothreads
--- scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.i686_pc_linux2.nothreads 2013-11-26 01:39:06.882926953 +0100
+++ scotch_6.0.0/src/Make.inc/Makefile.inc.i686_pc_linux2.nothreads 2013-11-26 02:01:19.338891116 +0100
@@ -11,7 +11,7 @@
CCD = gcc
CFLAGS = -O3 -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME
CLIBFLAGS =
-LDFLAGS = -lz -lm -lrt
+LDFLAGS = -Xlinker --add-needed -Xlinker --no-as-needed -lz -lm -lrt
CP = cp
LEX = flex -Pscotchyy -olex.yy.c
LN = ln
diff -ur scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.i686_pc_linux2.prof scotch_6.0.0/src/Make.inc/Makefile.inc.i686_pc_linux2.prof
--- scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.i686_pc_linux2.prof 2013-11-26 01:39:06.886926953 +0100
+++ scotch_6.0.0/src/Make.inc/Makefile.inc.i686_pc_linux2.prof 2013-11-26 02:01:19.338891116 +0100
@@ -11,7 +11,7 @@
CCD = gcc
CFLAGS = -pg -O3 -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_PTHREAD -DSCOTCH_RENAME
CLIBFLAGS =
-LDFLAGS = -lz -lm -lrt
+LDFLAGS = -Xlinker --add-needed -Xlinker --no-as-needed -lz -lm -lrt
CP = cp
LEX = flex -Pscotchyy -olex.yy.c
LN = ln
diff -ur scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib scotch_6.0.0/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib
--- scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib 2013-11-26 01:39:06.886926953 +0100
+++ scotch_6.0.0/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib 2013-11-26 02:01:19.338891116 +0100
@@ -11,7 +11,7 @@
CCD = gcc
CFLAGS = -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict
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_5.1.10b/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 = -Xlinker --add-needed -Xlinker --no-as-needed -lz -lm -lrt
CP = cp
LEX = flex -Pscotchyy -olex.yy.c
LN = ln
diff -ur scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib.debug scotch_6.0.0/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib.debug
--- scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib.debug 2013-11-26 01:39:06.886926953 +0100
+++ scotch_6.0.0/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib.debug 2013-11-26 02:01:19.338891116 +0100
@@ -11,7 +11,7 @@
CCD = gcc
CFLAGS = -g -O0 -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DSCOTCH_DEBUG_ALL -DSCOTCH_DETERMINISTIC -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME
CLIBFLAGS = -shared -fPIC
-LDFLAGS = -g -lz -lm -lrt
+LDFLAGS = -g -Xlinker --add-needed -Xlinker --no-as-needed -lz -lm -lrt
CP = cp
LEX = flex -Pscotchyy -olex.yy.c
LN = ln
diff -ur scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.i686_sun_solaris5 scotch_6.0.0/src/Make.inc/Makefile.inc.i686_sun_solaris5
--- scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.i686_sun_solaris5 2013-11-26 01:39:06.882926953 +0100
+++ scotch_6.0.0/src/Make.inc/Makefile.inc.i686_sun_solaris5 2013-11-26 02:01:19.338891116 +0100
@@ -11,7 +11,7 @@
CCD = mpicc
CFLAGS = -m64 -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_PTHREAD -DSCOTCH_RENAME -Du_int32_t=uint32_t -Du_int64_t=uint64_t
CLIBFLAGS =
-LDFLAGS = -lz -lm -lrt
+LDFLAGS = -Xlinker --add-needed -Xlinker --no-as-needed -lz -lm -lrt
CP = cp
LEX = flex -Pscotchyy -olex.yy.c
LN = ln
diff -ur scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.x86-64_pc_linux2 scotch_6.0.0/src/Make.inc/Makefile.inc.x86-64_pc_linux2
--- scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.x86-64_pc_linux2 2013-11-26 01:39:06.902926953 +0100
+++ scotch_6.0.0/src/Make.inc/Makefile.inc.x86-64_pc_linux2 2013-11-26 02:01:19.342891116 +0100
@@ -11,7 +11,7 @@
CCD = gcc
CFLAGS = -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64
CLIBFLAGS =
-LDFLAGS = -lz -lm -lrt
+LDFLAGS = -Xlinker --add-needed -Xlinker --no-as-needed -lz -lm -lrt
CP = cp
LEX = flex -Pscotchyy -olex.yy.c
LN = ln
diff -ur scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.x86-64_pc_linux2.icc scotch_6.0.0/src/Make.inc/Makefile.inc.x86-64_pc_linux2.icc
--- scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.x86-64_pc_linux2.icc 2013-11-26 01:39:06.902926953 +0100
+++ scotch_6.0.0/src/Make.inc/Makefile.inc.x86-64_pc_linux2.icc 2013-11-26 02:01:19.342891116 +0100
@@ -11,7 +11,7 @@
CCD = icc
CFLAGS = -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -restrict -DIDXSIZE64
CLIBFLAGS =
-LDFLAGS = -g -lz -lm -lrt
+LDFLAGS = -g -Xlinker --add-needed -Xlinker --no-as-needed -lz -lm -lrt
CP = cp
LEX = flex -Pscotchyy -olex.yy.c
LN = ln
diff -ur scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.x86-64_pc_linux2.icc.debug scotch_6.0.0/src/Make.inc/Makefile.inc.x86-64_pc_linux2.icc.debug
--- scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.x86-64_pc_linux2.icc.debug 2013-11-26 01:39:06.898926953 +0100
+++ scotch_6.0.0/src/Make.inc/Makefile.inc.x86-64_pc_linux2.icc.debug 2013-11-26 02:01:19.342891116 +0100
@@ -11,7 +11,7 @@
CCD = icc
CFLAGS = -g -O0 -fp-model strict -traceback -check-uninit -fp-stack-check -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_DEBUG_ALL -DSCOTCH_DETERMINISTIC -DSCOTCH_RENAME -restrict -DIDXSIZE64
CLIBFLAGS =
-LDFLAGS = -g -lz -lm -lrt
+LDFLAGS = -g -Xlinker --add-needed -Xlinker --no-as-needed -lz -lm -lrt
CP = cp
LEX = flex -Pscotchyy -olex.yy.c
LN = ln
diff -ur scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.x86-64_pc_linux2.shlib scotch_6.0.0/src/Make.inc/Makefile.inc.x86-64_pc_linux2.shlib
--- scotch_6.0.0_unchanged/src/Make.inc/Makefile.inc.x86-64_pc_linux2.shlib 2013-11-26 01:39:06.898926953 +0100
+++ scotch_6.0.0/src/Make.inc/Makefile.inc.x86-64_pc_linux2.shlib 2013-11-26 02:01:19.342891116 +0100
@@ -11,7 +11,7 @@
CCD = gcc
CFLAGS = -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64
CLIBFLAGS = -shared -fPIC
-LDFLAGS = -lz -lm -lrt
+LDFLAGS = -Xlinker --add-needed -Xlinker --no-as-needed -lz -lm -lrt
+LDFLAGS = -lpthread -lz -lm -lrt
CP = cp
LEX = flex -Pscotchyy -olex.yy.c
LN = ln

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

@ -30,7 +30,7 @@
#
# Author:
# Martin Beaudoin, Hydro-Quebec, (2010)
#
# Modified for version 6.0.0: Dominik Christ, Wikki Ltd., (2013)
#------------------------------------------------------------------------------
# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable
@ -91,11 +91,11 @@ Patch0: scotch-6.0.0_patch_0
%build
# export WM settings in a form that GNU configure recognizes
[ -n "$WM_CC" ] && export CC="$WM_CC"
[ -n "$WM_CXX" ] && export CXX="$WM_CXX"
[ -n "$WM_CFLAGS" ] && export CFLAGS="$WM_CFLAGS"
[ -n "$WM_CXXFLAGS" ] && export CXXFLAGS="$WM_CXXFLAGS"
[ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS"
# [ -n "$WM_CC" ] && export CC="$WM_CC"
# [ -n "$WM_CXX" ] && export CXX="$WM_CXX"
# [ -n "$WM_CFLAGS" ] && export CFLAGS="$WM_CFLAGS *****"
# [ -n "$WM_CXXFLAGS" ] && export CXXFLAGS="$WM_CXXFLAGS"
# [ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS"
cd src
# Here, unfortunately, some hand tweaking might be necessary if your system is not running Linux or MacOS X