73 lines
3.0 KiB
Diff
73 lines
3.0 KiB
Diff
From dd3ca38b27cce93f7e932abaa27b41371234fa90 Mon Sep 17 00:00:00 2001
|
|
From: Martin Jansa <Martin.Jansa@gmail.com>
|
|
Date: Tue, 24 Apr 2012 18:45:14 +0200
|
|
Subject: [PATCH] SConstruct: prefix includepy with sysroot and drop sysroot
|
|
from python_lib_dir
|
|
|
|
* without PYTHONPATH, distutil's sysconfig returns INCLUDEPY without sysroot prefix
|
|
and with PYTHONPATH from OE it's pointing to native python dir
|
|
|
|
$ export PYTHONPATH=/OE/shr-core/tmp-eglibc/sysroots/om-gta02/usr/lib/python2.7/
|
|
$ python
|
|
Python 2.7.2 (default, Apr 18 2012, 09:19:59)
|
|
[GCC 4.6.2] on linux2
|
|
Type "help", "copyright", "credits" or "license" for more information.
|
|
>>> from distutils import sysconfig
|
|
>>> sysconfig.get_config_vars('INCLUDEPY')
|
|
['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7']
|
|
>>>
|
|
$ unset PYTHONPATH
|
|
$ python
|
|
Python 2.7.2 (default, Apr 18 2012, 09:19:59)
|
|
[GCC 4.6.2] on linux2
|
|
Type "help", "copyright", "credits" or "license" for more information.
|
|
>>> from distutils import sysconfig
|
|
>>> sysconfig.get_config_vars('INCLUDEPY')
|
|
['/python2.7']
|
|
>>> import sysconfig
|
|
>>> sysconfig.get_config_vars('INCLUDEPY')
|
|
['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7']
|
|
* python_lib_dir = python_lib_dir.replace(env['sysroot'], '')
|
|
returns path to target sysroot
|
|
|
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
|
---
|
|
SConstruct | 9 +++++++++
|
|
1 files changed, 9 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/SConstruct b/SConstruct
|
|
index 3c919fc..8478181 100644
|
|
--- a/SConstruct
|
|
+++ b/SConstruct
|
|
@@ -932,6 +932,12 @@ else:
|
|
if vars[i] is None:
|
|
vars[i] = []
|
|
(cc, cxx, opt, basecflags, ccshared, ldshared, so_ext, includepy, ldflags) = vars
|
|
+
|
|
+ if env['sysroot']:
|
|
+ print "Prefixing includepy '%s' with sysroot prefix" % includepy
|
|
+ includepy = os.path.normpath("%s/%s/%s/%s" % (env['sysroot'], env['prefix'], env['includedir'], includepy))
|
|
+ print "'%s'" % includepy
|
|
+
|
|
# in case CC/CXX was set to the scan-build wrapper,
|
|
# ensure that we build the python modules with scan-build, too
|
|
if env['CC'] is None or env['CC'].find('scan-build') < 0:
|
|
@@ -1165,11 +1171,14 @@ if not env['python']:
|
|
python_install = []
|
|
else:
|
|
python_lib_dir = sysconfig.get_python_lib(plat_specific=1)
|
|
+ python_lib_dir = python_lib_dir.replace(env['sysroot'], '')
|
|
python_module_dir = python_lib_dir + os.sep + 'gps'
|
|
python_extensions_install = python_env.Install( DESTDIR + python_module_dir,
|
|
python_built_extensions)
|
|
if not env['debug'] and not env['profiling'] and env['strip']:
|
|
python_env.AddPostAction(python_extensions_install, '$STRIP $TARGET')
|
|
+ env.AddPostAction(python_extensions_install, '$CHRPATH -r "%s" "$TARGET"' \
|
|
+ % (python_lib_dir, ))
|
|
|
|
python_modules_install = python_env.Install( DESTDIR + python_module_dir,
|
|
python_modules)
|
|
--
|
|
1.7.8.5
|
|
|