r2790 - /1.3/sconstruct -- November 09, 2006 - 09:12

Author: bugman
Date: Thu Nov  9 09:11:43 2006
New Revision: 2790

URL: http://svn.gna.org/viewcvs/relax?rev=2790&view=rev
Log:
An attempt at removing the '-dynamiclib' gcc option when compiling the C 
modules on Mac OS X.

This problem was reported by Douglas Kojetin <douglas dot kojetin at gmail 
dot com> at
https://mail.gna.org/public/relax-users/2006-11/msg00002.html (Message-id:
<AD17DD2D-A37B-44D4-B1B8-1A2349EC7EC5@xxxxxxxxx>) and as bug #7670 
(https://gna.org/bugs/?7670).

To remove the '-dynamiclib' option, I replicated what Doug had done in his 
post at
https://mail.gna.org/public/relax-devel/2006-11/msg00098.html (Message-id:
<0E180DBB-896A-45F6-B19D-D6A02FD2BA4A@xxxxxxxxx>).  Rather than changing the 
line:

env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -dynamiclib')

in the SCons sources, I have replicated Doug's modification within the relax 
'sconstruct' script.
This change needs to be tested.


Modified:
    1.3/sconstruct

Modified: 1.3/sconstruct
URL: 
http://svn.gna.org/viewcvs/relax/1.3/sconstruct?rev=2790&r1=2789&r2=2790&view=diff
==============================================================================
--- 1.3/sconstruct (original)
+++ 1.3/sconstruct Thu Nov  9 09:11:43 2006
@@ -35,6 +35,7 @@
 from scons.distrib import package, gpg_sign
 from scons.install import install, uninstall
 from scons.manuals import clean_manual_files, compile_api_manual_html, 
compile_user_manual_html, compile_user_manual_pdf, fetch_docstrings, 
version_file
+import SCons.Util
 
 # relax version file.
 from version import version
@@ -481,9 +482,10 @@
         # Add the python library path to the environment.
         env.Append(LIBPATH = libpath)
 
-        # Catch Mac OS X and send the correct command line options to the 
linker.
+        # Catch Mac OS X and send the correct command line options to the 
linker (these may become redundant as SCons improves).
         if env['PLATFORM'] == 'darwin':
             env.Append(LINKFLAGS = ['-bundle', '-bundle_loader', sys.prefix 
+ path.sep + 'bin' + path.sep + 'python', '-dynamic'])
+            env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS')
 
         # Loop over the relaxation curve fitting files.
         nodes = []