summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-16 09:47:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-16 11:52:09 (GMT)
commitccc2b23191a4cc406a9a5540712bfb62cb067236 (patch)
tree0fdd45fd4a2eb0effd3c6e504dc2af67a1edf983 /meta/recipes-devtools
parent2ddf7d3e8326e8cb07101ddb2d6e5dc6866371e2 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-devtools/python/python-native/sys_platform_is_now_always_linux2.patch11
-rw-r--r--meta/recipes-devtools/python/python-native_2.7.2.bb2
-rw-r--r--meta/recipes-devtools/python/python_2.7.2.bb2
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 ed52936..1cb8fea 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
15Even if Python is compiled on Linux 3. 15Even if Python is compiled on Linux 3.
16 16
17diff --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";;
28diff --git a/configure.in b/configure.in 17diff --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 b00e2fc..175f31d 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 @@
1require python.inc 1require python.inc
2DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native" 2DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native"
3PR = "${INC_PR}.3" 3PR = "${INC_PR}.4"
4 4
5SRC_URI += "file://04-default-is-optimized.patch \ 5SRC_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 0a1708a..95e17a8 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 @@
1require python.inc 1require python.inc
2DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib" 2DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib"
3PR = "${INC_PR}.11" 3PR = "${INC_PR}.12"
4 4
5DISTRO_SRC_URI ?= "file://sitecustomize.py" 5DISTRO_SRC_URI ?= "file://sitecustomize.py"
6DISTRO_SRC_URI_linuxstdbase = "" 6DISTRO_SRC_URI_linuxstdbase = ""