mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-07 04:58:26 +00:00
Code Issues Projects Releases Wiki Activity

python: Fix re-execution problem due to patching configure and configure.in

Browse Source 
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>
This commit is contained in:
Richard Purdie
2012-04-16 10:47:56 +01:00
parent 2ddf7d3e83
commit ccc2b23191
3 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/python/python-native/sys_platform_is_now_always_linux2.patch
-11
View File
@@ -14,17 +14,6 @@ Issue #12326: sys.platform is now always 'linux2' on Linux
Even if Python is compiled on Linux 3. 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 diff --git a/configure.in b/configure.in
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
meta/recipes-devtools/python/python-native_2.7.2.bb
+1 -1
View File
@@ -1,6 +1,6 @@
require python.inc require python.inc
DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native" 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 \ SRC_URI += "file://04-default-is-optimized.patch \
file://05-enable-ctypes-cross-build.patch \ file://05-enable-ctypes-cross-build.patch \
meta/recipes-devtools/python/python_2.7.2.bb
+1 -1
View File
@@ -1,6 +1,6 @@
require python.inc require python.inc
DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib" 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 ?= "file://sitecustomize.py"
DISTRO_SRC_URI_linuxstdbase = "" DISTRO_SRC_URI_linuxstdbase = ""