diff options
Diffstat (limited to 'meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch')
| -rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch deleted file mode 100644 index 27c6aad167..0000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch +++ /dev/null | |||
| @@ -1,72 +0,0 @@ | |||
| 1 | From bc224302f1665078c8d15138318709c1a1c2c0a0 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 3 | Date: Tue, 24 Apr 2012 18:45:14 +0200 | ||
| 4 | Subject: [PATCH] SConstruct: prefix includepy with sysroot and drop sysroot | ||
| 5 | from python_lib_dir | ||
| 6 | |||
| 7 | * without PYTHONPATH, distutil's sysconfig returns INCLUDEPY without sysroot prefix | ||
| 8 | and with PYTHONPATH from OE it's pointing to native python dir | ||
| 9 | |||
| 10 | $ export PYTHONPATH=/OE/shr-core/tmp-eglibc/sysroots/om-gta02/usr/lib/python2.7/ | ||
| 11 | $ python | ||
| 12 | Python 2.7.2 (default, Apr 18 2012, 09:19:59) | ||
| 13 | [GCC 4.6.2] on linux2 | ||
| 14 | Type "help", "copyright", "credits" or "license" for more information. | ||
| 15 | >>> from distutils import sysconfig | ||
| 16 | >>> sysconfig.get_config_vars('INCLUDEPY') | ||
| 17 | ['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7'] | ||
| 18 | >>> | ||
| 19 | $ unset PYTHONPATH | ||
| 20 | $ python | ||
| 21 | Python 2.7.2 (default, Apr 18 2012, 09:19:59) | ||
| 22 | [GCC 4.6.2] on linux2 | ||
| 23 | Type "help", "copyright", "credits" or "license" for more information. | ||
| 24 | >>> from distutils import sysconfig | ||
| 25 | >>> sysconfig.get_config_vars('INCLUDEPY') | ||
| 26 | ['/python2.7'] | ||
| 27 | >>> import sysconfig | ||
| 28 | >>> sysconfig.get_config_vars('INCLUDEPY') | ||
| 29 | ['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7'] | ||
| 30 | * python_lib_dir = python_lib_dir.replace(env['sysroot'], '') | ||
| 31 | returns path to target sysroot | ||
| 32 | |||
| 33 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 34 | --- | ||
| 35 | SConstruct | 9 +++++++++ | ||
| 36 | 1 files changed, 9 insertions(+), 0 deletions(-) | ||
| 37 | |||
| 38 | diff --git a/SConstruct b/SConstruct | ||
| 39 | index 9ff00c1..9c0f751 100644 | ||
| 40 | --- a/SConstruct | ||
| 41 | +++ b/SConstruct | ||
| 42 | @@ -924,6 +924,12 @@ else: | ||
| 43 | if vars[i] is None: | ||
| 44 | vars[i] = "" | ||
| 45 | (cc, cxx, opt, basecflags, ccshared, ldshared, so_ext, includepy) = vars | ||
| 46 | + | ||
| 47 | + if env['sysroot']: | ||
| 48 | + print "Prefixing includepy '%s' with sysroot prefix" % includepy | ||
| 49 | + includepy = os.path.normpath("%s/%s/%s/%s" % (env['sysroot'], env['prefix'], env['includedir'], includepy)) | ||
| 50 | + print "'%s'" % includepy | ||
| 51 | + | ||
| 52 | # in case CC/CXX was set to the scan-build wrapper, | ||
| 53 | # ensure that we build the python modules with scan-build, too | ||
| 54 | if env['CC'] is None or env['CC'].find('scan-build') < 0: | ||
| 55 | @@ -1158,11 +1164,14 @@ if not env['python']: | ||
| 56 | python_install = [] | ||
| 57 | else: | ||
| 58 | python_lib_dir = sysconfig.get_python_lib(plat_specific=1) | ||
| 59 | + python_lib_dir = python_lib_dir.replace(env['sysroot'], '') | ||
| 60 | python_module_dir = python_lib_dir + os.sep + 'gps' | ||
| 61 | python_extensions_install = python_env.Install( DESTDIR + python_module_dir, | ||
| 62 | python_built_extensions) | ||
| 63 | if not env['debug'] or env['profiling']: | ||
| 64 | python_env.AddPostAction(python_extensions_install, '$STRIP $TARGET') | ||
| 65 | + env.AddPostAction(python_extensions_install, '$CHRPATH -r "%s" "$TARGET"' \ | ||
| 66 | + % (python_lib_dir, )) | ||
| 67 | |||
| 68 | python_modules_install = python_env.Install( DESTDIR + python_module_dir, | ||
| 69 | python_modules) | ||
| 70 | -- | ||
| 71 | 1.7.8.5 | ||
| 72 | |||
