Patchwork [3/3] python: fix sqlite RPATH issue

login
register
mail settings
Submitter Saul Wold
Date Sept. 29, 2011, 12:07 a.m.
Message ID <8dd692d309ecfbd969a6e01969e03d203f670dbe.1317254761.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/12361/
State New, archived
Headers show

Comments

Saul Wold - Sept. 29, 2011, 12:07 a.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../python/python/remove_sqlite_rpath.patch        |   12 ++++++++++++
 meta/recipes-devtools/python/python_2.6.6.bb       |    3 ++-
 2 files changed, 14 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python/remove_sqlite_rpath.patch
Richard Purdie - Sept. 29, 2011, 2:23 p.m.
On Wed, 2011-09-28 at 17:07 -0700, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  .../python/python/remove_sqlite_rpath.patch        |   12 ++++++++++++
>  meta/recipes-devtools/python/python_2.6.6.bb       |    3 ++-
>  2 files changed, 14 insertions(+), 1 deletions(-)
>  create mode 100644 meta/recipes-devtools/python/python/remove_sqlite_rpath.patch
> 
> 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 0000000..350151e
> --- /dev/null
> +++ b/meta/recipes-devtools/python/python/remove_sqlite_rpath.patch
> @@ -0,0 +1,12 @@
> +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:

Looks reasonable to me but no patch header? ;-)

Cheers,

Richard

Patch

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 0000000..350151e
--- /dev/null
+++ b/meta/recipes-devtools/python/python/remove_sqlite_rpath.patch
@@ -0,0 +1,12 @@ 
+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 aa7ec3c..77c0ff4 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"