From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mail.openembedded.org (Postfix) with ESMTP id 72CB870101 for ; Tue, 26 Sep 2017 16:56:46 +0000 (UTC) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP; 26 Sep 2017 09:56:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,441,1500966000"; d="scan'208";a="132518358" Received: from yctb02.ostc.intel.com (HELO yctb02.otcr.jf.intel.com) ([10.54.69.56]) by orsmga004.jf.intel.com with ESMTP; 26 Sep 2017 09:56:38 -0700 From: Alejandro Hernandez To: openembedded-core@lists.openembedded.org Date: Tue, 26 Sep 2017 09:56:37 -0700 Message-Id: <20170926165637.36321-1-alejandro.hernandez@linux.intel.com> X-Mailer: git-send-email 2.12.3 Subject: [PATCH] python-native: Build with ipv6 enabled X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Sep 2017 16:56:47 -0000 Before we introduced DISTRO_FEATURES_NATIVE on commit: db1f1adace58763c35774e3fdfeaac5c3ca646fd ipv6 was enabled by default on DISTRO_FEATURES via DISTRO_FEATURES_LIBC hence python-native was built with ipv6 support. After this, the check for ipv6 on DISTRO_FEATURES stopped working for the python-native recipe and it was always disabled. This patch fixes the implementation of EXTRA_OECONF to get the ipv6 configuration correctly (whether were building for native or target), and it also modifies DISTRO_FEATURES_NATIVE to add ipv6 by default, simply to get it working like it was before changes were made' Signed-off-by: Alejandro Hernandez --- meta/conf/bitbake.conf | 2 +- meta/recipes-devtools/python/python.inc | 11 +++++++++-- meta/recipes-devtools/python/python3_3.5.3.bb | 2 +- meta/recipes-devtools/python/python_2.7.13.bb | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 4ff1e9608e7..9ca7c57a5c3 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -807,7 +807,7 @@ IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" # Native distro features (will always be used for -native, even if they # are not enabled for target) -DISTRO_FEATURES_NATIVE ?= "x11" +DISTRO_FEATURES_NATIVE ?= "x11 ipv6" DISTRO_FEATURES_NATIVESDK ?= "x11 libc-charsets libc-locales libc-locale-code" # Normally target distro features will not be applied to native builds: diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc index b40f551ab39..73b95ad2c71 100644 --- a/meta/recipes-devtools/python/python.inc +++ b/meta/recipes-devtools/python/python.inc @@ -22,13 +22,20 @@ PYTHON_MAJMIN = "2.7" inherit autotools pkgconfig -EXTRA_OECONF = "\ +EXTRA_OECONF_class-target = "\ + --enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)} \ +" +EXTRA_OECONF_class-native = "\ + --enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES_NATIVE', 'ipv6', 'yes', 'no', d)} \ +" + +# _append automatically gets appended to the correct EXTRA_OECONF_class-<> +EXTRA_OECONF_append = "\ --with-threads \ --with-pymalloc \ --without-cxx-main \ --with-signal-module \ --enable-shared \ - --enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)} \ ac_cv_header_bluetooth_bluetooth_h=no ac_cv_header_bluetooth_h=no \ ${PYTHONLSBOPTS} \ " diff --git a/meta/recipes-devtools/python/python3_3.5.3.bb b/meta/recipes-devtools/python/python3_3.5.3.bb index 13df12fe566..2657ed09618 100644 --- a/meta/recipes-devtools/python/python3_3.5.3.bb +++ b/meta/recipes-devtools/python/python3_3.5.3.bb @@ -66,7 +66,7 @@ CACHED_CONFIGUREVARS = "ac_cv_have_chflags=no \ TARGET_CC_ARCH += "-DNDEBUG -fno-inline" SDK_CC_ARCH += "-DNDEBUG -fno-inline" EXTRA_OEMAKE += "CROSS_COMPILE=yes" -EXTRA_OECONF += "CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ --without-ensurepip" +EXTRA_OECONF_append = " CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ --without-ensurepip" export CROSS_COMPILE = "${TARGET_PREFIX}" export _PYTHON_PROJECT_BASE = "${B}" diff --git a/meta/recipes-devtools/python/python_2.7.13.bb b/meta/recipes-devtools/python/python_2.7.13.bb index 4d73cd25c8b..c346b0988bd 100644 --- a/meta/recipes-devtools/python/python_2.7.13.bb +++ b/meta/recipes-devtools/python/python_2.7.13.bb @@ -37,7 +37,7 @@ inherit autotools multilib_header python-dir pythonnative CONFIGUREOPTS += " --with-system-ffi " -EXTRA_OECONF += "ac_cv_file__dev_ptmx=yes ac_cv_file__dev_ptc=no" +EXTRA_OECONF_append = " ac_cv_file__dev_ptmx=yes ac_cv_file__dev_ptc=no" do_configure_append() { rm -f ${S}/Makefile.orig -- 2.12.3