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:52:09 +0100 |
commit | ccc2b23191a4cc406a9a5540712bfb62cb067236 (patch) | |
tree | 0fdd45fd4a2eb0effd3c6e504dc2af67a1edf983 /meta/recipes-devtools | |
parent | 2ddf7d3e8326e8cb07101ddb2d6e5dc6866371e2 (diff) | |
download | poky-ccc2b23191a4cc406a9a5540712bfb62cb067236.tar.gz |
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]
(From OE-Core rev: 1d8c40d5f2119b4c4ae8a9b2645ae572ea9a54ff)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
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 | |||
14 | 14 | ||
15 | Even if Python is compiled on Linux 3. | 15 | Even if Python is compiled on Linux 3. |
16 | 16 | ||
17 | diff --git a/configure b/configure | ||
18 | --- a/configure | ||
19 | +++ b/configure | ||
20 | @@ -2995,6 +2995,7 @@ then | ||
21 | MACHDEP="$ac_md_system$ac_md_release" | ||
22 | |||
23 | case $MACHDEP in | ||
24 | + linux*) MACHDEP="linux2";; | ||
25 | cygwin*) MACHDEP="cygwin";; | ||
26 | darwin*) MACHDEP="darwin";; | ||
27 | atheos*) MACHDEP="atheos";; | ||
28 | diff --git a/configure.in b/configure.in | 17 | diff --git a/configure.in b/configure.in |
29 | --- a/configure.in | 18 | --- a/configure.in |
30 | +++ b/configure.in | 19 | +++ 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 @@ | |||
1 | require python.inc | 1 | require python.inc |
2 | DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native" | 2 | DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native" |
3 | PR = "${INC_PR}.3" | 3 | PR = "${INC_PR}.4" |
4 | 4 | ||
5 | SRC_URI += "file://04-default-is-optimized.patch \ | 5 | SRC_URI += "file://04-default-is-optimized.patch \ |
6 | file://05-enable-ctypes-cross-build.patch \ | 6 | 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 @@ | |||
1 | require python.inc | 1 | require python.inc |
2 | DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib" | 2 | DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib" |
3 | PR = "${INC_PR}.11" | 3 | PR = "${INC_PR}.12" |
4 | 4 | ||
5 | DISTRO_SRC_URI ?= "file://sitecustomize.py" | 5 | DISTRO_SRC_URI ?= "file://sitecustomize.py" |
6 | DISTRO_SRC_URI_linuxstdbase = "" | 6 | DISTRO_SRC_URI_linuxstdbase = "" |