Ticket #32251: patch-SConstruct.diff

SConstruct

@@ -21 +21 @@
 
 SConsignFile() # no .scsonsign into $PREFIX please
 
-if sys.platform == "darwin":
-    default_prefix = '/opt/local/'
-else:
-    default_prefix = '/usr/local/'
+default_prefix = '@PREFIX@/'
 
 opts = Variables()
 opts.Add(PathVariable('prefix', 'autotools-style installation prefix', default_prefix, validator=PathVariable.PathIsDirCreate))
@@ -45 +42 @@
 numpy_path = numpy.get_include()
 env.Append(CPPPATH=numpy_path)
 
+env['CXX'] = os.environ.get('CXX', 'g++')
 
 if sys.platform == "win32":
     # official python shipped with no pc file on windows so get from current python
     from distutils import sysconfig
     pre,inc = sysconfig.get_config_vars('exec_prefix', 'INCLUDEPY')
     env.Append(CPPPATH=inc, LIBPATH=pre+'\libs', LIBS='python'+sys.version[0]+sys.version[2])
-elif sys.platform == "darwin":
-    env.ParseConfig('python-config --cflags')
-    env.ParseConfig('python-config --ldflags')
 else:
     # some distros use python2.5-config, others python-config2.5
     try:
         env.ParseConfig(python + '-config --cflags')
-        env.ParseConfig(python + '-config --ldflags')
+        ldflags = env.backtick(python + '-config --ldflags').split()
+
+        print 'ldflags:      ', ldflags
+
+        # Put all options after -u in LINKFLAGS
+        try:
+            idx = ldflags.index('-u')
+            env.Append(LINKFLAGS=ldflags[idx:])
+            del ldflags[idx:]
+        except ValueError:
+            idx = -1
+
+        print 'ldflags fixed:', ldflags
+
+        env.MergeFlags(' '.join(ldflags))
+
+        print 'CXX:      ', env['CXX']
+        print 'CCFLAGS:  ', env['CCFLAGS']
+        print 'LIBS:     ', env['LIBS']
+        print 'LINKFLAGS:', env['LINKFLAGS']
     except OSError:
         print 'going to try python-config instead'
         env.ParseConfig('python-config --ldflags')
@@ -81 +95 @@
 
 def burn_python_version(target, source, env):
     # make sure we run the python version that we built the extension modules for
-    s =  '#!/usr/bin/env ' + python + '\n'
+    s =  '#!@PREFIX@/bin/' + python + '\n'
     s += 5*'#\n'
     s += '# DO NOT EDIT - edit %s instead\n' % source[0]
     s += 5*'#\n'