Ticket #22230: relax.patch

relax

@@ -1 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2.6
 
 ###############################################################################
 #                                                                             #

scons/install.py

@@ -112 +112 @@
     ###############
 
     # Run relax to create the *.pyc files.
-    print "\nRunning relax to create the byte-compiled *.pyc files."
-    system(env['SYMLINK'] + " --test")
+    # print "\nRunning relax to create the byte-compiled *.pyc files."
+    # system(env['SYMLINK'] + " --test")
 
     # Final print out.
     print "\n\n\n"

sconstruct

@@ -94 +94 @@
     SYS = SYSTEM
 
     # Mac OS X installation path.
-    INSTALL_PATH = sys.prefix + sep + 'local'
+    INSTALL_PATH = '@DEST_ROOT@@PREFIX@' + sep + 'lib'
 
 
 # All other operating systems.
@@ -111 +111 @@
 ###############
 
 # Relax installation directory.
-RELAX_PATH = INSTALL_PATH + sep + 'relax'
+RELAX_PATH = INSTALL_PATH + sep + 'relax'
 
 # Installation path for binaries.
-BIN_PATH = INSTALL_PATH + sep + 'bin'
+BIN_PATH = '@DEST_ROOT@@PREFIX@' + sep + 'bin'
 
 # Symbolic link installation path.
 SYMLINK = BIN_PATH + sep + 'relax'
 
 
-
 # The distribution files.
 #########################
 
@@ -486 +485 @@
 
         # 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.Append(LINKFLAGS = ['-bundle', '-bundle_loader', sys.prefix + path.sep + 'bin' + path.sep + 'python2.6', '-dynamic', '-undefined', 'dynamic_lookup'])
             env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS')
             env['SHLIBSUFFIX'] = '.so'