Ticket #34890: relax.patch

relax

@@ -1 @@
-#! /usr/bin/env python
+#!@PREFIX@/bin/python2.7
 
 # Import the relax module.
 import relax

sconstruct

@@ -99 +99 @@
     SYS = SYSTEM
 
     # Mac OS X installation path.
-    INSTALL_PATH = sys.prefix + sep + 'local'
+    INSTALL_PATH = '@DEST_ROOT@@PREFIX@' + sep + 'lib'
 
 
 # All other operating systems.
@@ -119 +119 @@
 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.
 #########################
 
@@ -515 +514 @@
             cflags = '/nologo /I\"' + py_include_minpath + '\" /I\"' + numpy_path + '\"'
         else:
             cflags = '-I' + py_include_fullpath + ' -I' + numpy_path
-        if env['PLATFORM'] == 'darwin':
-            for arch in ['i386', 'ppc', 'x86_64']:
-                cflags += ' -arch %s' % arch
 
         # Python library path.
         libpath = ''
@@ -537 +533 @@
                 '-undefined', 'dynamic_lookup'
             ]
 
-            # Force all architectures.
-            for arch in ['i386', 'ppc', 'x86_64']:
-                lnflags.append('-arch')
-                lnflags.append(arch)
-
             # Set up the environment.
             env.Append(LINKFLAGS = lnflags)
             env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS')

scons/install.py

@@ -112 +112 @@
     ###############
 
     # Run relax to create the *.pyc files.
-    print("\nCreating the byte-compiled *.pyc files.")
-    python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
-    cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path)
-    print(cmd)
-    system(cmd)
+    #print("\nCreating the byte-compiled *.pyc files.")
+    #python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
+    #cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path)
+    #print(cmd)
+    #system(cmd)
 
     # Final printout.
     print("\n\n\n")