summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2018-10-25 16:59:28 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-07 14:38:39 +0000
commitfd045373e01409e273479c9e0e2e69bd1b7815f9 (patch)
treef8c41d8148b15ac321298eae5857152cf42fd5c1 /meta
parent82315924b79b349b3798dd40786a19ee4f474cd4 (diff)
downloadpoky-fd045373e01409e273479c9e0e2e69bd1b7815f9.tar.gz
python-native: fix one do_populate_sysroot warning
Fix below warning: WARNING: Skipping RPATH /usr/lib64 as is a standard search path for work/x86_64-linux/python-native/2.7.15-r1.1/recipe-sysroot-native/ usr/lib/python2.7/lib-dynload/_bsddb.so setup.py will check db.h under include_dirs, for native build, /usr/lib64 will be insert to postion 0 of include_dirs, so it's priority is higher then our sysroot, cause db.h sysroot is ignored, and rpath set to /usr/lib64. and this cause warning when do_populate_sysroot. use append to fix it. (From OE-Core rev: cf994752b69083aaa4f0b873357d6c873b32d7be) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/python/python-native/0001-python-native-fix-one-do_populate_sysroot-warning.patch39
-rw-r--r--meta/recipes-devtools/python/python-native_2.7.15.bb1
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python-native/0001-python-native-fix-one-do_populate_sysroot-warning.patch b/meta/recipes-devtools/python/python-native/0001-python-native-fix-one-do_populate_sysroot-warning.patch
new file mode 100644
index 0000000000..989818927d
--- /dev/null
+++ b/meta/recipes-devtools/python/python-native/0001-python-native-fix-one-do_populate_sysroot-warning.patch
@@ -0,0 +1,39 @@
1From 12292444e1b3662b994bc223d92b8338fb0895ff Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 25 Oct 2018 07:32:14 +0000
4Subject: [PATCH] python-native: fix one do_populate_sysroot warning
5
6Fix below warning:
7WARNING: Skipping RPATH /usr/lib64 as is a standard search path for
8work/x86_64-linux/python-native/2.7.15-r1.1/recipe-sysroot-native/
9usr/lib/python2.7/lib-dynload/_bsddb.so
10
11setup.py will check db.h under include_dirs, for native build,
12/usr/lib64 will be insert to postion 0 of include_dirs, so
13it's priority is higher then our sysroot, cause db.h sysroot
14is ignored, and rpath set to /usr/lib64. and this cause warning
15when do_populate_sysroot. use append to fix it.
16
17Upstream-Status: Inappropriate [oe-specific]
18
19Signed-off-by: Changqing Li <changqing.li@windriver.com>
20---
21 setup.py | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/setup.py b/setup.py
25index 7bf13ed..6c0f29b 100644
26--- a/setup.py
27+++ b/setup.py
28@@ -40,7 +40,7 @@ def add_dir_to_list(dirlist, dir):
29 1) 'dir' is not already in 'dirlist'
30 2) 'dir' actually exists, and is a directory."""
31 if dir is not None and os.path.isdir(dir) and dir not in dirlist:
32- dirlist.insert(0, dir)
33+ dirlist.append(dir)
34
35 def macosx_sdk_root():
36 """
37--
382.18.0
39
diff --git a/meta/recipes-devtools/python/python-native_2.7.15.bb b/meta/recipes-devtools/python/python-native_2.7.15.bb
index de35104c60..b0c2a59656 100644
--- a/meta/recipes-devtools/python/python-native_2.7.15.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.15.bb
@@ -16,6 +16,7 @@ SRC_URI += "\
16 file://builddir.patch \ 16 file://builddir.patch \
17 file://parallel-makeinst-create-bindir.patch \ 17 file://parallel-makeinst-create-bindir.patch \
18 file://revert_use_of_sysconfigdata.patch \ 18 file://revert_use_of_sysconfigdata.patch \
19 file://0001-python-native-fix-one-do_populate_sysroot-warning.patch \
19 " 20 "
20 21
21S = "${WORKDIR}/Python-${PV}" 22S = "${WORKDIR}/Python-${PV}"