summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-07 11:18:13 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-07 11:37:13 (GMT)
commitf6763e90b23d1e609b0428ca3dfc81d824a62ea4 (patch)
tree40eb31567f3ba19a4eab9944154232cd4b3347c1
parent41fc0ae69b05eee13c144ca790039f1780a1bf04 (diff)
downloadpoky-f6763e90b23d1e609b0428ca3dfc81d824a62ea4.tar.gz
python: Fix RPATH QA issue on non-gplv3 builds
On non-gplv3 builds, gdbm gets built different due to the different version which triggers a different codepath in python's db support and then hence triggers an invalid RPATH QA issue. This change extends the appropriate patch to cover the code paths we need it to cover and avoid adding the problematic RPATH. (From OE-Core rev: 90540692c40719b757b80bdc6e78e679a3df83a7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python/python-2.7.3-remove-bsdb-rpath.patch28
1 files changed, 16 insertions, 12 deletions
diff --git a/meta/recipes-devtools/python/python/python-2.7.3-remove-bsdb-rpath.patch b/meta/recipes-devtools/python/python/python-2.7.3-remove-bsdb-rpath.patch
index 4b8953a..dfd346f 100644
--- a/meta/recipes-devtools/python/python/python-2.7.3-remove-bsdb-rpath.patch
+++ b/meta/recipes-devtools/python/python/python-2.7.3-remove-bsdb-rpath.patch
@@ -1,15 +1,14 @@
1Remove the RPTH to avoid QA issue warning. 1Remove the RPATH to avoid QA issue warning.
2 2
3RP: Added secondary unnecessary rpath to the list 2012/8/7
3Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 4Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
4---
5 setup.py | 1 -
6 1 files changed, 0 insertions(+), 1 deletions(-)
7 5
8diff --git a/setup.py b/setup.py 6
9index 83b5e56..1fd5487 100644 7Index: Python-2.7.3/setup.py
10--- a/setup.py 8===================================================================
11+++ b/setup.py 9--- Python-2.7.3.orig/setup.py 2012-08-07 10:41:58.560132529 +0000
12@@ -1025,7 +1025,6 @@ class PyBuildExt(build_ext): 10+++ Python-2.7.3/setup.py 2012-08-07 11:09:47.852094515 +0000
11@@ -1042,7 +1042,6 @@
13 exts.append(Extension('_bsddb', ['_bsddb.c'], 12 exts.append(Extension('_bsddb', ['_bsddb.c'],
14 depends = ['bsddb.h'], 13 depends = ['bsddb.h'],
15 library_dirs=dblib_dir, 14 library_dirs=dblib_dir,
@@ -17,6 +16,11 @@ index 83b5e56..1fd5487 100644
17 include_dirs=db_incs, 16 include_dirs=db_incs,
18 libraries=dblibs)) 17 libraries=dblibs))
19 else: 18 else:
20-- 19@@ -1252,7 +1251,6 @@
211.7.4 20 print "building dbm using bdb"
22 21 dbmext = Extension('dbm', ['dbmmodule.c'],
22 library_dirs=dblib_dir,
23- runtime_library_dirs=dblib_dir,
24 include_dirs=db_incs,
25 define_macros=[
26 ('HAVE_BERKDB_H', None),