From: hschang Date: Wed, 2 Jul 2014 04:57:37 +0000 (+0900) Subject: [python] update to 2.7.3 X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=03e3f604ce2dd54e0a660776d155cc6042216825 [python] update to 2.7.3 --- diff --git a/meta-openvuplus/recipes-devtools/python/python-native_2.7.2.bbappend b/meta-openvuplus/recipes-devtools/python/python-native_2.7.2.bbappend deleted file mode 100644 index e697d30..0000000 --- a/meta-openvuplus/recipes-devtools/python/python-native_2.7.2.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -PR .= "-vuplus0" - -RPROVIDES_{PN} += "python-pickle-native python-pprint-native" - diff --git a/meta-openvuplus/recipes-devtools/python/python-native_2.7.3.bbappend b/meta-openvuplus/recipes-devtools/python/python-native_2.7.3.bbappend new file mode 100644 index 0000000..6b7c568 --- /dev/null +++ b/meta-openvuplus/recipes-devtools/python/python-native_2.7.3.bbappend @@ -0,0 +1,4 @@ +PR .= "-vuplus0" + +RPROVIDES_${PN} += "python-pickle-native python-pprint-native" + diff --git a/meta-openvuplus/recipes-devtools/python/python/ctypes-error-handling-fix.patch b/meta-openvuplus/recipes-devtools/python/python/ctypes-error-handling-fix.patch index 5e07082..9b9aa11 100644 --- a/meta-openvuplus/recipes-devtools/python/python/ctypes-error-handling-fix.patch +++ b/meta-openvuplus/recipes-devtools/python/python/ctypes-error-handling-fix.patch @@ -1,6 +1,8 @@ ---- a/Modules/_ctypes/_ctypes.c 2012-01-26 15:41:30.000000000 +0100 -+++ b/Modules/_ctypes/_ctypes.c 2012-01-26 15:44:41.046977137 +0100 -@@ -602,10 +602,16 @@ +diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c +index 4ae2c41..ebd9960 100644 +--- a/Modules/_ctypes/_ctypes.c ++++ b/Modules/_ctypes/_ctypes.c +@@ -602,10 +602,16 @@ CDataType_in_dll(PyObject *type, PyObject *args) #ifdef __CYGWIN__ /* dlerror() isn't very helpful on cygwin */ PyErr_Format(PyExc_ValueError, @@ -19,7 +21,7 @@ #endif return NULL; } -@@ -3290,10 +3296,16 @@ +@@ -3343,10 +3349,16 @@ PyCFuncPtr_FromDll(PyTypeObject *type, PyObject *args, PyObject *kwds) #ifdef __CYGWIN__ /* dlerror() isn't very helpful on cygwin */ PyErr_Format(PyExc_AttributeError, diff --git a/meta-openvuplus/recipes-devtools/python/python/fix_pthread_site.patch b/meta-openvuplus/recipes-devtools/python/python/fix_pthread_site.patch index d392060..0554067 100644 --- a/meta-openvuplus/recipes-devtools/python/python/fix_pthread_site.patch +++ b/meta-openvuplus/recipes-devtools/python/python/fix_pthread_site.patch @@ -1,6 +1,8 @@ ---- configure.in.org 2008-05-01 12:40:58.000000000 +0200 -+++ configure.in 2008-05-01 12:39:39.000000000 +0200 -@@ -998,7 +999,7 @@ +diff --git a/configure.in b/configure.in +index d0c9f83..b565f95 100644 +--- a/configure.in ++++ b/configure.in +@@ -1303,7 +1303,7 @@ then # so we need to run a program to see whether it really made the # function available. AC_MSG_CHECKING(whether $CC accepts -pthread) @@ -8,8 +10,8 @@ +AC_CACHE_VAL(ac_cv_pthread, [ac_save_cc="$CC" CC="$CC -pthread" - AC_TRY_RUN([ -@@ -1023,11 +1024,11 @@ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ +@@ -1325,11 +1325,11 @@ fi # If we have set a CC compiler flag for thread support then # check if it works for CXX, too. @@ -23,7 +25,7 @@ if test "$ac_cv_kpthread" = "yes" then -@@ -1056,9 +1057,11 @@ +@@ -1358,9 +1358,11 @@ then fi rm -fr conftest* fi diff --git a/meta-openvuplus/recipes-devtools/python/python/no-ldconfig.patch b/meta-openvuplus/recipes-devtools/python/python/no-ldconfig.patch index fff1ccd..69a8ff2 100644 --- a/meta-openvuplus/recipes-devtools/python/python/no-ldconfig.patch +++ b/meta-openvuplus/recipes-devtools/python/python/no-ldconfig.patch @@ -1,9 +1,10 @@ Fixes exception on 'import uuid' if ldconfig is unavailable. -diff -Naur Python-2.6.7.orig/Lib/ctypes/util.py Python-2.6.7/Lib/ctypes/util.py ---- Python-2.6.7.orig/Lib/ctypes/util.py 2010-03-20 03:11:16.000000000 +0100 -+++ Python-2.6.7/Lib/ctypes/util.py 2012-01-12 15:26:37.562726637 +0100 -@@ -204,7 +204,16 @@ +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 7aee0ef..e03bb13 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -210,7 +210,16 @@ elif os.name == "posix": return res.group(1) def find_library(name): diff --git a/meta-openvuplus/recipes-devtools/python/python/some_configure_fixes.patch b/meta-openvuplus/recipes-devtools/python/python/some_configure_fixes.patch index eced413..b4cd504 100644 --- a/meta-openvuplus/recipes-devtools/python/python/some_configure_fixes.patch +++ b/meta-openvuplus/recipes-devtools/python/python/some_configure_fixes.patch @@ -1,7 +1,9 @@ ---- configure.in 2008-02-13 20:17:17.000000000 +0100 -+++ configure.in 2008-10-21 22:45:31.000000000 +0200 -@@ -3369,27 +3369,9 @@ - AC_MSG_RESULT(no) +diff --git a/configure.in b/configure.in +index 2d997dc..d0c9f83 100644 +--- a/configure.in ++++ b/configure.in +@@ -4167,27 +4167,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[void *x=resizeterm + [AC_MSG_RESULT(no)] ) -AC_MSG_CHECKING(for /dev/ptmx) @@ -28,5 +30,5 @@ -fi +AC_CHECK_FILE(/dev/ptc, AC_DEFINE(HAVE_DEV_PTC, 1, [Define if we have /dev/ptc.])) - case $MACHDEP in - darwin) + if test "$have_long_long" = yes + then diff --git a/meta-openvuplus/recipes-devtools/python/python_2.7.2.bbappend b/meta-openvuplus/recipes-devtools/python/python_2.7.2.bbappend deleted file mode 100644 index dca8c27..0000000 --- a/meta-openvuplus/recipes-devtools/python/python_2.7.2.bbappend +++ /dev/null @@ -1,19 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -PR .= "-vuplus0" - -SRC_URI += " \ - file://some_configure_fixes.patch;striplevel=0 \ - file://fix_pthread_site.patch;striplevel=0 \ - file://no-ldconfig.patch \ - file://ctypes-error-handling-fix.patch \ -" - -EXTRA_OECONF += " \ - ac_cv_file__dev_ptmx=yes \ - ac_cv_file__dev_ptc=no \ - ac_cv_no_strict_aliasing_ok=yes \ - ac_cv_pthread=yes \ - ac_cv_cxx_thread=yes \ - ac_cv_sizeof_off_t=8 \ -" diff --git a/meta-openvuplus/recipes-devtools/python/python_2.7.3.bbappend b/meta-openvuplus/recipes-devtools/python/python_2.7.3.bbappend new file mode 100644 index 0000000..9a2b602 --- /dev/null +++ b/meta-openvuplus/recipes-devtools/python/python_2.7.3.bbappend @@ -0,0 +1,19 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PR .= "-vuplus0" + +SRC_URI += " \ + file://some_configure_fixes.patch \ + file://fix_pthread_site.patch \ + file://no-ldconfig.patch \ + file://ctypes-error-handling-fix.patch \ +" + +EXTRA_OECONF += " \ + ac_cv_file__dev_ptmx=yes \ + ac_cv_file__dev_ptc=no \ + ac_cv_no_strict_aliasing_ok=yes \ + ac_cv_pthread=yes \ + ac_cv_cxx_thread=yes \ + ac_cv_sizeof_off_t=8 \ +"