diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2011-09-29 08:54:04 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-29 16:57:23 +0100 |
| commit | 9f9612d15acc6ee3b71f52bdb3f1ec4cb56b1a17 (patch) | |
| tree | a3780e01d88dbfce644bd63658dd231cec909bf3 /meta/recipes-devtools/python | |
| parent | 9c9ea24b115a9bb87df1323b5f185ce426262aec (diff) | |
| download | openembedded-core-9f9612d15acc6ee3b71f52bdb3f1ec4cb56b1a17.tar.gz | |
python: fix sqlite RPATH issue
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
| -rw-r--r-- | meta/recipes-devtools/python/python/remove_sqlite_rpath.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python_2.6.6.bb | 3 |
2 files changed, 21 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python/remove_sqlite_rpath.patch b/meta/recipes-devtools/python/python/remove_sqlite_rpath.patch new file mode 100644 index 0000000000..4ec627ea51 --- /dev/null +++ b/meta/recipes-devtools/python/python/remove_sqlite_rpath.patch @@ -0,0 +1,19 @@ +This patch removes the RPATH setting which contains a pointer to +the target relocated sysroot, which is incorrect. + +Upstream-Status: Inappropriate [Embedded Specific] + +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +Index: Python-2.6.6/setup.py +=================================================================== +--- Python-2.6.6.orig/setup.py 2011-09-28 14:22:57.000000000 -0700 ++++ Python-2.6.6/setup.py 2011-09-28 16:11:25.147279633 -0700 +@@ -1079,7 +1079,6 @@ + include_dirs=["Modules/_sqlite", + sqlite_incdir], + library_dirs=sqlite_libdir, +- runtime_library_dirs=sqlite_libdir, + extra_link_args=sqlite_extra_link_args, + libraries=["sqlite3",])) + else: diff --git a/meta/recipes-devtools/python/python_2.6.6.bb b/meta/recipes-devtools/python/python_2.6.6.bb index aa7ec3c699..77c0ff47b3 100644 --- a/meta/recipes-devtools/python/python_2.6.6.bb +++ b/meta/recipes-devtools/python/python_2.6.6.bb @@ -1,7 +1,7 @@ require python.inc DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" -PR = "${INC_PR}.10" +PR = "${INC_PR}.11" LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6" DISTRO_SRC_URI ?= "file://sitecustomize.py" @@ -21,6 +21,7 @@ SRC_URI = "\ file://multilib.patch \ file://security_issue_2254_fix.patch \ file://cgi_py.patch \ + file://remove_sqlite_rpath.patch \ " SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14" |