ThirdParty packages: modification for calling make another compiler than gcc

diff --git a/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec b/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec
index e38ccf3..5249f9f 100644 (file)
--- a/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec
+++ b/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec
@@ -95,8 +95,15 @@ Patch1:                 ParMGridGen-1.0.patch
 %endif
 
 %build
+    [ -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"
+
     [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1
-    make -j $WM_NCOMPPROCS
+
+    make -j $WM_NCOMPPROCS CC=$CC
 
 %install
     # Manual installation

diff --git a/ThirdParty/rpmBuild/SPECS/metis-5.0pre2.spec b/ThirdParty/rpmBuild/SPECS/metis-5.0pre2.spec
index 50a081f..e0ab2c4 100644 (file)
--- a/ThirdParty/rpmBuild/SPECS/metis-5.0pre2.spec
+++ b/ThirdParty/rpmBuild/SPECS/metis-5.0pre2.spec
@@ -105,8 +105,8 @@ Patch0:                 metis-5.0pre2_patch_darwin
     (cd GKlib/trunk && make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -fPIC")
     (cd libmetis    && make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -fPIC") 
 %else
-    (cd GKlib/trunk && make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -fPIC -D_POSIX_C_SOURCE=200809")
-    (cd libmetis    && make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -fPIC -D_POSIX_C_SOURCE=200809") 
+    (cd GKlib/trunk && make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -fPIC -D_POSIX_C_SOURCE=200809" CC=$CC)
+    (cd libmetis    && make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -fPIC -D_POSIX_C_SOURCE=200809"  CC=$CC)
 %endif
 
 %install

diff --git a/ThirdParty/rpmBuild/SPECS/scotch-5.1.10b.spec b/ThirdParty/rpmBuild/SPECS/scotch-5.1.10b.spec
index ec4a071..625f79c 100644 (file)
--- a/ThirdParty/rpmBuild/SPECS/scotch-5.1.10b.spec
+++ b/ThirdParty/rpmBuild/SPECS/scotch-5.1.10b.spec
@@ -106,8 +106,8 @@ Patch0:                 scotch-5.1.10b_patch_0
 %endif
 
     [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1
-    make -j $WM_NCOMPPROCS scotch
-    make -j $WM_NCOMPPROCS ptscotch
+    make -j $WM_NCOMPPROCS scotch  CC="$WM_CC" CXX="$WM_CXX" CCD="$WM_CC" CCS="$WM_CC" AR="$WM_CC"
+    make -j $WM_NCOMPPROCS ptscotch  AR="$WM_CC"
 
 %install
     cd src