From bb5849423d7ed299b4c895a14d3754121ff68069 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 19 Oct 2015 19:56:12 -0700 Subject: 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. Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3_3.4.3.bb | 5 +---- meta/recipes-devtools/python/python_2.7.9.bb | 5 ----- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'meta/recipes-devtools/python') 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 \ ac_cv_file__dev_ptmx=yes \ ac_cv_file__dev_ptc=no \ " -# The 3 lines below are copied from the libffi recipe, ctypes ships its own copy of the libffi sources -#Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :( -TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__" -TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__" + TARGET_CC_ARCH += "-DNDEBUG -fno-inline" EXTRA_OEMAKE += "CROSS_COMPILE=yes" EXTRA_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 CONFIGUREOPTS += " --with-system-ffi " -# The 3 lines below are copied from the libffi recipe, ctypes ships its own copy of the libffi sources -#Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :( -TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__" -TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__" - # The following is a hack until we drop ac_cv_sizeof_off_t from site files EXTRA_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" -- cgit v1.2.3