[cig-commits] r4236 - long/3D/Gale/trunk

[walter at geodynamics.org]

Author: walter
Date: 2006-08-04 23:53:19 -0700 (Fri, 04 Aug 2006)
New Revision: 4236

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/INSTALL.STATIC
   long/3D/Gale/trunk/SConstruct.in
Log:
 r573 at earth:  boo | 2006-08-04 23:51:49 -0700
 Fixes for static builds on OS X



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:570
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:573

Modified: long/3D/Gale/trunk/INSTALL.STATIC
===================================================================
--- long/3D/Gale/trunk/INSTALL.STATIC	2006-08-05 06:49:51 UTC (rev 4235)
+++ long/3D/Gale/trunk/INSTALL.STATIC	2006-08-05 06:53:19 UTC (rev 4236)
@@ -1,6 +1,6 @@
 If you want to make a static build (i.e. a single, monolithic
 executable that you can just copy to another machine), then do not
-configure --with-shared.  Also, when building, you must set the
+configure --with-shared.  On Linux, you must, when building, set the
 STATIC_BUILD environment variable.  As in
 
   $ STATIC_BUILD=1 make install
@@ -16,3 +16,9 @@
 
 To make static builds on your machine, you may have to edit
 SConstruct.in to set appropriate library paths and extra libraries.
+
+On OS X, you must not set the STATIC_BUILD environment variable.  The
+-static option does not work on OS X.  Instead, make sure that petsc
+(and by extension mpich) is built statically.  The veclib you get with
+the developer tools is a static library.  All of the other
+requirements (libxml2, libc) should be on users machines.

Modified: long/3D/Gale/trunk/SConstruct.in
===================================================================
--- long/3D/Gale/trunk/SConstruct.in	2006-08-05 06:49:51 UTC (rev 4235)
+++ long/3D/Gale/trunk/SConstruct.in	2006-08-05 06:53:19 UTC (rev 4236)
@@ -45,7 +45,8 @@
 env.Append(LIBS=Split('@MPI_LIBS@'))
 for path in Split('@MPI_LIBPATH@'):
     env.Append(LIBPATH=['#/'+path])
-env.Append(RPATH=Split('@MPI_LIBPATH@'))
+if with_shared:
+    env.Append(RPATH=Split('@MPI_LIBPATH@'))
 
 # Add in the libxml2 paths
 for path in Split('@LIBXML2_CPPPATH@'):
@@ -53,7 +54,8 @@
 env.Append(LIBS=Split('@LIBXML2_LIBS@'))
 for path in Split('@LIBXML2_LIBPATH@'):
     env.Append(LIBPATH=['#/'+path])
-env.Append(RPATH=Split('@LIBXML2_LIBPATH@'))
+if with_shared:
+    env.Append(RPATH=Split('@LIBXML2_LIBPATH@'))
 
 # Add in the petsc paths
 for path in Split('@PETSC_CPPPATH@'):
@@ -61,11 +63,14 @@
 env.Append(LIBS=Split('@PETSC_LIBS@'))
 for path in Split('@PETSC_LIBPATH@'):
     env.Append(LIBPATH=['#/'+path])
-env.Append(RPATH=Split('@PETSC_LIBPATH@'))
+if with_shared:
+    env.Append(RPATH=Split('@PETSC_LIBPATH@'))
 env.ParseConfig('echo "@PETSC_DEPS@"')
 
 # Set up stuff for a static build
 
+env.Append(FRAMEWORKS=["vecLib"])
+
 if os.getenv("STATIC_BUILD"):
     if with_shared:
         print "Can not make a static build if you configured using --with-shared"