diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-16 10:47:56 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-16 12:44:36 +0100 |
| commit | 1d8c40d5f2119b4c4ae8a9b2645ae572ea9a54ff (patch) | |
| tree | 98070a4c9ce27475218072571195ff30bdbfb84c /meta | |
| parent | e7135f14f3ef37f93f5c28b319464f3d6dd9b8da (diff) | |
| download | openembedded-core-1d8c40d5f2119b4c4ae8a9b2645ae572ea9a54ff.tar.gz openembedded-core-1d8c40d5f2119b4c4ae8a9b2645ae572ea9a54ff.tar.bz2 openembedded-core-1d8c40d5f2119b4c4ae8a9b2645ae572ea9a54ff.zip | |
python: Fix re-execution problem due to patching configure and configure.in
There was a patch patching both configure and configure.in. Since the recipes
all autoreconf, this is pointless and means subsequent patch tasks fail.
The fix is to only patch configure.in.
[YOCTO #2194]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
3 files changed, 2 insertions, 13 deletions
diff --git a/meta/recipes-devtools/python/python-native/sys_platform_is_now_always_linux2.patch b/meta/recipes-devtools/python/python-native/sys_platform_is_now_always_linux2.patch index ed529366c5..1cb8fea50f 100644 --- a/meta/recipes-devtools/python/python-native/sys_platform_is_now_always_linux2.patch +++ b/meta/recipes-devtools/python/python-native/sys_platform_is_now_always_linux2.patch @@ -14,17 +14,6 @@ Issue #12326: sys.platform is now always 'linux2' on Linux Even if Python is compiled on Linux 3. -diff --git a/configure b/configure ---- a/configure -+++ b/configure -@@ -2995,6 +2995,7 @@ then - MACHDEP="$ac_md_system$ac_md_release" - - case $MACHDEP in -+ linux*) MACHDEP="linux2";; - cygwin*) MACHDEP="cygwin";; - darwin*) MACHDEP="darwin";; - atheos*) MACHDEP="atheos";; diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in diff --git a/meta/recipes-devtools/python/python-native_2.7.2.bb b/meta/recipes-devtools/python/python-native_2.7.2.bb index b00e2fcc3e..175f31d94e 100644 --- a/meta/recipes-devtools/python/python-native_2.7.2.bb +++ b/meta/recipes-devtools/python/python-native_2.7.2.bb @@ -1,6 +1,6 @@ require python.inc DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native" -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" SRC_URI += "file://04-default-is-optimized.patch \ file://05-enable-ctypes-cross-build.patch \ diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb index 0a1708a57e..95e17a83d6 100644 --- a/meta/recipes-devtools/python/python_2.7.2.bb +++ b/meta/recipes-devtools/python/python_2.7.2.bb @@ -1,6 +1,6 @@ require python.inc DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib" -PR = "${INC_PR}.11" +PR = "${INC_PR}.12" DISTRO_SRC_URI ?= "file://sitecustomize.py" DISTRO_SRC_URI_linuxstdbase = "" |