summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-10-19 19:56:12 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:39:27 +0000
commit69836e88a8b74bda3b346a3bcb54f2f92c5ee589 (patch)
tree98ef68d1343b302e83edd551937d0be09c98744d /meta/recipes-devtools/python
parent38d1d63bc9357ebb07ecaa290ca4e368d134d57a (diff)
downloadpoky-69836e88a8b74bda3b346a3bcb54f2f92c5ee589.tar.gz
python: don't append -D__SOFTFP__ to TARGET_CC_ARCH for armv6/armv7a
Remove obsolete hack which seems to date back to (at least) 2009. It's potentially harmful as python TARGET_CC_ARCH flags can leak through to other packages via the sysroot _sysconfigdata.py. (From OE-Core rev: bb5849423d7ed299b4c895a14d3754121ff68069) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
-rw-r--r--meta/recipes-devtools/python/python3_3.4.3.bb5
-rw-r--r--meta/recipes-devtools/python/python_2.7.9.bb5
2 files changed, 1 insertions, 9 deletions
diff --git a/meta/recipes-devtools/python/python3_3.4.3.bb b/meta/recipes-devtools/python/python3_3.4.3.bb
index f61d278d79..a33f10f01f 100644
--- a/meta/recipes-devtools/python/python3_3.4.3.bb
+++ b/meta/recipes-devtools/python/python3_3.4.3.bb
@@ -56,10 +56,7 @@ CACHED_CONFIGUREVARS = "ac_cv_have_chflags=no \
56 ac_cv_file__dev_ptmx=yes \ 56 ac_cv_file__dev_ptmx=yes \
57 ac_cv_file__dev_ptc=no \ 57 ac_cv_file__dev_ptc=no \
58" 58"
59# The 3 lines below are copied from the libffi recipe, ctypes ships its own copy of the libffi sources 59
60#Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :(
61TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__"
62TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__"
63TARGET_CC_ARCH += "-DNDEBUG -fno-inline" 60TARGET_CC_ARCH += "-DNDEBUG -fno-inline"
64EXTRA_OEMAKE += "CROSS_COMPILE=yes" 61EXTRA_OEMAKE += "CROSS_COMPILE=yes"
65EXTRA_OECONF += "CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ --without-ensurepip" 62EXTRA_OECONF += "CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ --without-ensurepip"
diff --git a/meta/recipes-devtools/python/python_2.7.9.bb b/meta/recipes-devtools/python/python_2.7.9.bb
index f7e2f272f4..bc20417674 100644
--- a/meta/recipes-devtools/python/python_2.7.9.bb
+++ b/meta/recipes-devtools/python/python_2.7.9.bb
@@ -34,11 +34,6 @@ inherit autotools multilib_header python-dir pythonnative
34 34
35CONFIGUREOPTS += " --with-system-ffi " 35CONFIGUREOPTS += " --with-system-ffi "
36 36
37# The 3 lines below are copied from the libffi recipe, ctypes ships its own copy of the libffi sources
38#Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :(
39TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__"
40TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__"
41
42# The following is a hack until we drop ac_cv_sizeof_off_t from site files 37# The following is a hack until we drop ac_cv_sizeof_off_t from site files
43EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'ac_cv_sizeof_off_t=8', '', d)} ac_cv_file__dev_ptmx=yes ac_cv_file__dev_ptc=no" 38EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'ac_cv_sizeof_off_t=8', '', d)} ac_cv_file__dev_ptmx=yes ac_cv_file__dev_ptc=no"
44 39