diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2009-02-16 17:21:27 -0500 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-02-16 17:21:27 -0500 |
| commit | ab6ba812119aa2fbd9c14a5fd7dc0cca63ed5a12 (patch) | |
| tree | 7b6422158b69da132640bd9dcf55e6fea855809e | |
| parent | b6771d35fa32f1b5a3f8a7f3e0b815d036e3798c (diff) | |
python-2.6.1: add back empty -O flag to fix weird host==target binary mixing
| -rw-r--r-- | packages/python/python-2.6.1/99-ignore-optimization-flag.patch | 19 | ||||
| -rw-r--r-- | packages/python/python_2.6.1.bb | 3 |
2 files changed, 21 insertions, 1 deletions
diff --git a/packages/python/python-2.6.1/99-ignore-optimization-flag.patch b/packages/python/python-2.6.1/99-ignore-optimization-flag.patch new file mode 100644 index 0000000000..02dc44c847 --- /dev/null +++ b/packages/python/python-2.6.1/99-ignore-optimization-flag.patch @@ -0,0 +1,19 @@ +# Reinstate the empty -O option to fix weird mixing of native and target +# binaries and libraries with LD_LIBRARY_PATH when host==target +# +# Signed-off-by: Denys Dmytriyenko <denis@denix.org> + +Index: Python-2.6.1/Modules/main.c +=================================================================== +--- Python-2.6.1-orig/Modules/main.c ++++ Python-2.6.1/Modules/main.c +@@ -352,6 +352,9 @@ Py_Main(int argc, char **argv) + + /* case 'J': reserved for Jython */ + ++ case 'O': /* ignore it */ ++ break; ++ + case 'N': + Py_OptimizeFlag=0; + break; diff --git a/packages/python/python_2.6.1.bb b/packages/python/python_2.6.1.bb index ae9f8ee725..57c64dfa55 100644 --- a/packages/python/python_2.6.1.bb +++ b/packages/python/python_2.6.1.bb @@ -1,7 +1,7 @@ require python.inc DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib" DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" -PR = "ml3" +PR = "ml4" SRC_URI = "\ http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ @@ -12,6 +12,7 @@ SRC_URI = "\ file://04-default-is-optimized.patch;patch=1 \ file://05-enable-ctypes-cross-build.patch;patch=1 \ file://06-libffi-enable-default-mips.patch;patch=1 \ + file://99-ignore-optimization-flag.patch;patch=1 \ \ # not yet pushed forward # sitecustomize, sitebranding |