[cig-commits] [commit] devel: Fix bug in scotch Makefile. (f4abcbd)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/specfem3d

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/2c88025773127e1007f771ff49d5062cf66582f1...bb56942e46ba174f771c76f345e4bd1352d9db4b

>---------------------------------------------------------------

commit f4abcbde98f88b5c1ac985860c1c8dd51d8252ea
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date:   Tue Jan 6 22:40:03 2015 -0500

    Fix bug in scotch Makefile.
    
    Variables assigned in a Makefile and on the environment are not passed
    along to recursive invocations of make. This causes a problem where the
    VERSION is undefined causing compiler errors with the produced header
    file.


>---------------------------------------------------------------

f4abcbde98f88b5c1ac985860c1c8dd51d8252ea
 src/decompose_mesh/scotch_5.1.12b/src/Makefile                |  1 +
 .../scotch_5.1.12b/src/libscotch/library_version.c            | 11 +++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/decompose_mesh/scotch_5.1.12b/src/Makefile b/src/decompose_mesh/scotch_5.1.12b/src/Makefile
index 263c327..c56ee86 100644
--- a/src/decompose_mesh/scotch_5.1.12b/src/Makefile
+++ b/src/decompose_mesh/scotch_5.1.12b/src/Makefile
@@ -33,6 +33,7 @@
 VERSION	= 5
 RELEASE = 1
 PATCHLEVEL = 12
+export VERSION RELEASE PATCHLEVEL
 
 .PHONY				:	clean	default	install	realclean	required	scotch
 
diff --git a/src/decompose_mesh/scotch_5.1.12b/src/libscotch/library_version.c b/src/decompose_mesh/scotch_5.1.12b/src/libscotch/library_version.c
index af3b645..9147f9a 100644
--- a/src/decompose_mesh/scotch_5.1.12b/src/libscotch/library_version.c
+++ b/src/decompose_mesh/scotch_5.1.12b/src/libscotch/library_version.c
@@ -76,12 +76,7 @@ int * const                 versptr,
 int * const                 relaptr,
 int * const                 patcptr)
 {
-//  *versptr = SCOTCH_VERSION;
-//  *relaptr = SCOTCH_RELEASE;
-//  *patcptr = SCOTCH_PATCHLEVEL;
-
-// DK DK hardwired this to avoid compilation problems on some machines
-  *versptr = 5;
-  *relaptr = 1;
-  *patcptr = 12;
+  *versptr = SCOTCH_VERSION;
+  *relaptr = SCOTCH_RELEASE;
+  *patcptr = SCOTCH_PATCHLEVEL;
 }