From patchwork Wed Nov 27 14:00:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 180299 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp6156913ilf; Wed, 27 Nov 2019 06:00:40 -0800 (PST) X-Google-Smtp-Source: APXvYqx5Hr355KTmVgFwnFjPsUywhXfBk1JG6WbrN9dff1sp4eNUDMh7gL29jS/gC5vkjHF9qfIf X-Received: by 2002:a62:2a4c:: with SMTP id q73mr46555308pfq.94.1574863240674; Wed, 27 Nov 2019 06:00:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574863240; cv=none; d=google.com; s=arc-20160816; b=ifW//hsL1WYrzfvbtwFwnFGSDFrIhZkgiKOSTPP8Po1bEOMH9sSDEoYeDcDFLz5bY7 5/tduSBvcmMXOZ34AOIGIElnoAy19bjI829GpaLTsAlbJdLnZUZfOgs5dmXHK/qhX2iC bqCA30KdZ8DhvHtZn2CqlPFEBOjGFIquvoFxDPngEMJqNCV8P/7cvdEolcJ6Z3Iy0T17 WDqrIH6x5YdRtIaWqbFMW7BKFGLKyN6Z7q34PpaDR6AlWBNmI96N6z6rKPtRDwTsWqcE XaeORmi3Q6dwhqo/1Pf3hRTlU9HiYicLiHYXkg9SvWh92u+vDrgrjuuB6+P/Am+MGMqN Q8qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=OQAKkB8q6GSqmhoTLuauhA7V7Mso+pGDq9euo5gw2Gs=; b=f9IdosqF1FMYeWtnglH8SIFwQPtj+tJGciYLbCELGOsOQEatM1NiuyAzf+Nr3QV2GM qi4nNgKnEs7XKWRxxn9ZAG7lIJI+aWsLJqO6nHzJ2DL9bPmgTefA2EK6sAcjTquUdFVF Wf+m7dDisuDXsmBaWFIPna05b/l6WQI3ARcvn4HYW4CvtfxrcnDCrNddGX09SQ4jTECB X/We4jzuAttYx2SR5dldsxVbR3pCRvGI+Jrj9erE0t8bGZ1p2Uxqyzl/d//jG4Hoi+0t sbcJeJHjz8zQFmo5WmuuyXHrj/CmsUTP98ZTesX7R/zPoSilippfboMq7RdI4hsy2NUH OGPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=IAQrTFsd; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id r8si14907929pgp.556.2019.11.27.06.00.40; Wed, 27 Nov 2019 06:00:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=IAQrTFsd; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 4EAB97FBC6; Wed, 27 Nov 2019 14:00:37 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mail.openembedded.org (Postfix) with ESMTP id A4C557FA45 for ; Wed, 27 Nov 2019 14:00:35 +0000 (UTC) Received: by mail-wr1-f51.google.com with SMTP id i12so26874494wro.5 for ; Wed, 27 Nov 2019 06:00:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=haCTNdolDgAr5vc2azaUOWwy4yiz2cVcD3OcWNNSDI8=; b=IAQrTFsdR5Q3j/r9r00S7fvMXrXqXr6UCbtO1i94jhxa/hinEZdJQl58T8u02pqWlC rRf4KE/DbvCUY3vCv3LykASET09Uf1xLq/kL7cYEQAuOOfnilfn7P8+gSf98oG2dS3Ix Hedc4MjlyaPH9GVBnyzkK6hHGxVJFysYEeSlYDr0L7ktRGQPdHxQ2EwlrpPuT+dgx8/S VjLsmnoi7wNo6U73yc+mu5YWpU+tWRUBGB+nORocorTLK4g/QN3tG9QGy2Vl3DxwjpNF ue05JqQhl8+pgbu+9ghvauZMHQi0zOHHDt8/QYsXt88RI+c0L+oXaDyXzYiuUgDF/msy NQzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=haCTNdolDgAr5vc2azaUOWwy4yiz2cVcD3OcWNNSDI8=; b=TL/Mvk84XLQAQU+ufi1yrsN7MjuH6Apx80l3EmSW+2Iw/r173ba9tvLbKPjoSxefOJ qcHw0REunOVmZyfdCStoPKTfpuGmdvipRa91tJqBNulqfIG9Mxa989r1sIUv/PnuB7B9 2LnD7gduHg1jyIRSomWAG0w+CoTG8AlIkjmKRR3z3lyeS7AQ22n0aqVX2Rcet6/gDSoz G55bk7tKnG+h4zCtkkWNoJvi2NOCa7kTtQy0B559bUYBiw7XU9ESnFguCnsy2M04TUR2 lz4eNMbpKQR8o0GzGeWEShDhf6LC7kw42WcgC4+CcpDtABxbShucFnz7zDyhF9OFQYlx MUKg== X-Gm-Message-State: APjAAAUrWmvHQhMxyfoBkJIfehUqr/y3mL1mivEKhRdf19m1kAz69p5h FTsR+LedRWx8VZaP9I5X79uxSy2AbY4= X-Received: by 2002:a05:6000:1286:: with SMTP id f6mr38490418wrx.44.1574863235927; Wed, 27 Nov 2019 06:00:35 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id o1sm19372284wrs.50.2019.11.27.06.00.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 06:00:34 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 27 Nov 2019 14:00:25 +0000 Message-Id: <20191127140030.7838-1-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [OE-core] [PATCH 1/6] python: no need to add HOSTPGEN 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org There's no need to patch in HOSTPGEN when we can just override PGEN directly. Signed-off-by: Ross Burton --- .../01-use-proper-tools-for-cross-build.patch | 17 ----------------- meta/recipes-devtools/python/python_2.7.17.bb | 9 ++++++--- 2 files changed, 6 insertions(+), 20 deletions(-) -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch index e795a74b911..7d8e95fe5cc 100644 --- a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch +++ b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch @@ -16,14 +16,6 @@ Index: Python-2.7.13/Makefile.pre.in =================================================================== --- Python-2.7.13.orig/Makefile.pre.in +++ Python-2.7.13/Makefile.pre.in -@@ -245,6 +245,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ - ########################################################################## - # Parser - PGEN= Parser/pgen$(EXE) -+HOSTPGEN= $(PGEN)$(EXE) - - PSRCS= \ - Parser/acceler.c \ @@ -512,7 +513,7 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) @@ -33,15 +25,6 @@ Index: Python-2.7.13/Makefile.pre.in # Create build directory and generate the sysconfig build-time data there. # pybuilddir.txt contains the name of the build dir and is used for -@@ -663,7 +663,7 @@ - # Regenerate Include/graminit.h and Python/graminit.c - # from Grammar/Grammar using pgen - @$(MKDIR_P) Include -- $(PGEN) $(srcdir)/Grammar/Grammar \ -+ $(HOSTPGEN) $(srcdir)/Grammar/Grammar \ - $(srcdir)/Include/graminit.h \ - $(srcdir)/Python/graminit.c - @@ -1121,27 +1122,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi diff --git a/meta/recipes-devtools/python/python_2.7.17.bb b/meta/recipes-devtools/python/python_2.7.17.bb index 5b856a50977..6199a5da760 100644 --- a/meta/recipes-devtools/python/python_2.7.17.bb +++ b/meta/recipes-devtools/python/python_2.7.17.bb @@ -44,6 +44,9 @@ PACKAGECONFIG ??= "bdb" PACKAGECONFIG[bdb] = ",,db" PACKAGECONFIG[tk] = ",,tk" +# pgen isn't needed in the current build, but use the binary from python-native just in case. +EXTRA_OEMAKE = "PGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen" + do_configure_append() { rm -f ${S}/Makefile.orig autoreconf -Wcross --verbose --install --force --exclude=autopoint ../Python-${PV}/Modules/_ctypes/libffi @@ -82,7 +85,7 @@ do_compile() { export CROSS_COMPILE="${TARGET_PREFIX}" export PYTHONBUILDDIR="${B}" - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \ + oe_runmake \ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \ STAGING_LIBDIR=${STAGING_LIBDIR} \ STAGING_INCDIR=${STAGING_INCDIR} \ @@ -100,7 +103,7 @@ do_install() { # After swizzling the makefile, we need to run the build again. # install can race with the build so we have to run this first, then install - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \ + oe_runmake \ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \ CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \ STAGING_LIBDIR=${STAGING_LIBDIR} \ @@ -108,7 +111,7 @@ do_install() { STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ DESTDIR=${D} LIBDIR=${libdir} - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \ + oe_runmake \ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \ CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \ STAGING_LIBDIR=${STAGING_LIBDIR} \ From patchwork Wed Nov 27 14:00:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 180301 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp6157246ilf; Wed, 27 Nov 2019 06:00:55 -0800 (PST) X-Google-Smtp-Source: APXvYqzcE4TWohnfA5BjI5gJMBv9OmHvktQlX4dDtqzkDu8C2JUS7QlTR07XU2nSzq+JqaoOjdpu X-Received: by 2002:a62:ac06:: with SMTP id v6mr46596233pfe.210.1574863254932; Wed, 27 Nov 2019 06:00:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574863254; cv=none; d=google.com; s=arc-20160816; b=tu2J1EEDujbV3FPiZEKNzJ3OePe/YPEK/EGjPeKwe8zcNLQw0gTi+MYEQGmV8g6USq JEmMpMjMgu0g/dFofsRdpN8LNO5Kueu99qeh/+LPT4VzwinN4yX8Q9Rkr0JxcvRjKcjP 10A5w9ltdokesz5XbOvyYIivdweFurezeVQo3j877S8wKkCb7Jeiz9YO/584240ISChu gCJKpdn41+O2zdiyBmpYrzFti9b9on0JzB+nFliLusENx9mfLb/h04a0NJojwgt2aw4a WrJoPFEcaXG0kay7e13pQ7gGdxJAdxInKRcPy6L1biUm9O/TPA/kvg+YFez8oseBsXjq BQnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=Hfbq1VCZzgW/TSRUnV/9JaGhgYgORNIVP5CgkhLRr30=; b=na7jOjmir86Q1Yr2AuKSuW0ME5I970wz/FG+o0GyWkDCeBBH0ypObfTnmIhZef/bDs d5OBZjpCLi1leKs/Audzyg2MDhjR/Gl8Tg/yqK+soIwRwTiqt3RNSTNfQI+65HBizzQk 7dxnsdo6hevi6BF05AKvnnLlpy+ET8p6llwX8OF+cZ8E9gsD0LQ9ZYuUItCLChGEqI/d R+l9+rjA5tVXa6UxmdJukCDUjAApSuHnBUxorQqAmCxAq2ixYTTuU+vzkGphYvoUn7Vl 5rJ+RoO1YJRCH8O8z0uYoSFLF/kXXotDI91FXeJAmB/TGdxEhWUgEZMCcTsUfDVQRBlp KQjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=PY277SED; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id x2si15184384pfi.43.2019.11.27.06.00.53; Wed, 27 Nov 2019 06:00:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=PY277SED; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 00B867FC51; Wed, 27 Nov 2019 14:00:42 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mail.openembedded.org (Postfix) with ESMTP id 7EA567FC06 for ; Wed, 27 Nov 2019 14:00:37 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id g7so6119715wrw.4 for ; Wed, 27 Nov 2019 06:00:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=3HMUwVdb20hza9lWbI77svFF6q8sqSjq/SynzFT//2w=; b=PY277SED3UUPF7Kn96QpKD8ln39LSQAZVAZ5F2wH/5eegCAC42E92xTpGjJc392hp+ loxFefZrTQEPyd8MEwD7YForP148r1LukYHPP8JfL4RtmfxFHLbAsFu39sliPpxaLoKq cNnNdbyZBn/DWBY3zkhq704oJhLrv3BcVawyB19Mbu5CHiLFg5NajcD5PbUp5H+PrYpL a4rL3c48Dv2ksmsGBz/5MViluhemtuNU6+wb7fKBCSmZ8V+XbVOpdGEs/IPLbeh/ID2I bA3GksKDtMJu19j+T+eoTV2wGiY9XCxepq5Zaz6MbrAup/j6xLSV2XAxD/DQHvF8TLwX F6ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3HMUwVdb20hza9lWbI77svFF6q8sqSjq/SynzFT//2w=; b=oXvSTZSKEI4hE9XIDnJZtUwxHaCI65tTowegnew78aTQuNfA3qwl4UOl2+RaboMdlN 8e8yD539dE7zYx5LOZeW3y86UhKHg6jMZa1hb+iolAk5UuHdlr8M3FeYVViBz0wOHURw r0EtBD7kLTmPqGHNkRoMpssF0Xc/CcJD6UnyD3RQUEyWpupomzNTVvTNNByTF1lopYZs WfIjgedSYJBZXGb5sY8U2qTp6ld8GRW+9XpXLMoN69bRqlGCHzgBGWvBF8tXi17wfqBY 7ZK9QROHrpCnfF/22wpqyHH/S3yGMhwkI4/hZdL0cb9iRwQB6T1/v9882XpHWsL/wU4K naZw== X-Gm-Message-State: APjAAAUAwmanKXNh5noaj3eS6u0MVsMRaEOglvF8S7kZaWXkoZCT9fh3 fMpoyA1OFXgEW4MaHx+kcaH9VF6Wqws= X-Received: by 2002:a5d:5267:: with SMTP id l7mr101410wrc.84.1574863237064; Wed, 27 Nov 2019 06:00:37 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id o1sm19372284wrs.50.2019.11.27.06.00.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 06:00:36 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 27 Nov 2019 14:00:26 +0000 Message-Id: <20191127140030.7838-2-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191127140030.7838-1-ross.burton@intel.com> References: <20191127140030.7838-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 2/6] python: move make override variables to EXTRA_OEMAKE 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Instead of passing the same five variables to oe_runmake repeatedly, add them to EXTRA_OEMAKE once. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python_2.7.17.bb | 31 ++++++------------- 1 file changed, 10 insertions(+), 21 deletions(-) -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/python/python_2.7.17.bb b/meta/recipes-devtools/python/python_2.7.17.bb index 6199a5da760..ef5d5644812 100644 --- a/meta/recipes-devtools/python/python_2.7.17.bb +++ b/meta/recipes-devtools/python/python_2.7.17.bb @@ -45,7 +45,13 @@ PACKAGECONFIG[bdb] = ",,db" PACKAGECONFIG[tk] = ",,tk" # pgen isn't needed in the current build, but use the binary from python-native just in case. -EXTRA_OEMAKE = "PGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen" +EXTRA_OEMAKE = "PGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \ + CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ + " do_configure_append() { rm -f ${S}/Makefile.orig @@ -85,12 +91,7 @@ do_compile() { export CROSS_COMPILE="${TARGET_PREFIX}" export PYTHONBUILDDIR="${B}" - oe_runmake \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ - OPT="${CFLAGS}" + oe_runmake OPT="${CFLAGS}" } do_install() { @@ -103,21 +104,9 @@ do_install() { # After swizzling the makefile, we need to run the build again. # install can race with the build so we have to run this first, then install - oe_runmake \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \ - CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ - DESTDIR=${D} LIBDIR=${libdir} + oe_runmake DESTDIR=${D} LIBDIR=${libdir} - oe_runmake \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \ - CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \ - DESTDIR=${D} LIBDIR=${libdir} install + oe_runmake DESTDIR=${D} LIBDIR=${libdir} install install -m 0644 Makefile.sysroot ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile From patchwork Wed Nov 27 14:00:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 180300 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp6157031ilf; Wed, 27 Nov 2019 06:00:46 -0800 (PST) X-Google-Smtp-Source: APXvYqwjxvWXLVdMgbVS+VEbN+gbmwDl2AnFKd/rgb/WQWMC7LSERGX66sJzBlqRjmdsDk2OYxMp X-Received: by 2002:a17:902:9f91:: with SMTP id g17mr4199949plq.286.1574863246067; Wed, 27 Nov 2019 06:00:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574863246; cv=none; d=google.com; s=arc-20160816; b=QnTAI6ZpaAMhyf/I5kOY6YR6h22UgeqU6HDTTsXLDnYnYInkH7MWhnv8fTg1xwsEAM G6eD4RUqZrS1ykg5zlURbo0T5Phq0Uc912HLbQfuavTdbgr3bIXFxzYum//d40Jh1U4A /bKqTMotArWeXFItaGUssx3wqamXNC+fwrZAhdsb3WplK4okodWeDBiNQ26VgA0ZD6iI b3KU5EQu+9sEBmMiUXBWyx4+kHFj1QEg6Y1g+nW+Cp07CgpoC4T0C5ABnAq+rNdBQjsz nDYJ9G9csIri4NGdlani7fBikySo2Yqz5xHDkxeTHhzvG7/Z8c9Y4khEDjanKYhpdEXy zy8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=TDBylWIbK4InEtIcuYeiuAtTJvcla8JgmZ4tbx57zIs=; b=oNvQp4S+3scqUEadziGJEADsAM+oAyGFctv9ZIARNR1wvo4sMvlW1Y8+IGm0cUSlaE eeR02fLmpxqQUZzSHRgx3maFcVkCUiV9srrMNulNbnJDYPgW+3Ow2F9eH9+96FI7zKlq BH76t/oF+dK6OX+Z4/fIGsVI7PEa9P1VgqDB9r3viDR4TeX/qFqBPgfzVRGROIOnc0Q3 xdvmWk2fF9ClLoC0MiMweKblxWQknTnAo59yjXsJWCbUhGnMdG44ozWSI12+mcMo4EH+ GNvxqYhZrbabbEOW0bgH5lmXQTH9AIWegyqukv4mE8xoCQ33v125iwByn5PsITlrFYk6 aFEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=cGRWYTiH; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id s23si15512274pgh.280.2019.11.27.06.00.45; Wed, 27 Nov 2019 06:00:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=cGRWYTiH; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id BA7CA7FC18; Wed, 27 Nov 2019 14:00:40 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mail.openembedded.org (Postfix) with ESMTP id A0BE67FC0C for ; Wed, 27 Nov 2019 14:00:37 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id n1so26820427wra.10 for ; Wed, 27 Nov 2019 06:00:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=5cJjUG1a3bmsMm5Oa0wAoGpp01I4V5fHIofG00dya7k=; b=cGRWYTiHi3zki4G32yKnJ/tkfeWVMtAoQ8POQDTQ+OuTAof1FmfmaEbLiKAUl20b78 SUnJxA+Kzw19xwkAVozLOduMlQnJG6UgEeMulon0nZD8W7j2ndM2oFmYxiWwo3qVaIQB dKEOsaSaHAz7rgWoWuij92wOfC1vQy+poS5lTqw8fwPHBnGydb3E4kAojViWWcd4qAZN Z8zkeOOBhTBMv1n28jIsaamnB/enUkOEBQEUcrdlg/sROx7RSBSrK6X4W0Bo/ovVonlQ wm3qI6Gfl3oUFBXCts0cYGEfXRarIMaidFq2THZoLHCInSaY+p2a8t2w5DqqGdXmuMTC vCfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5cJjUG1a3bmsMm5Oa0wAoGpp01I4V5fHIofG00dya7k=; b=OyMxwnwLAxrUO5D4JTQG+l1TBOU/ve2RlFOJ2Cb4EqizKJ17fIpU8Bw6Q1QnYNzT30 A/cUeH/D1Pwbs1AK7dgyd5D8zeOZ3G5ahCvy2MvdyPwIQrl0wSd/xgrbWQoFafz7RQ31 5FcnaSiiLtIL0tt7ujhcdazNd4HdSApjg1V7nzUjW+F4AuuPCkbWc3A4wtEvJ/ACOQ4+ iZHGxyrajVi6C6iPgPaonqgZ7ujHJcR/i/CfspuraQR+VxtEGrs5cNFsLCPwYDCJ+bWy tzclQe8xZ3Qq6TZURuMFPD+UX3b/2sP7S3FwYN8rFHYedrxCe+94149VMUKr2y6nS4G/ DKGA== X-Gm-Message-State: APjAAAVxwj2C4CDewqUfzN/uItimmeN2RM4rx2v1WX1j5+AhjukUydaO FtLmevE0knITSm24dj5bZj7leaKRAF4= X-Received: by 2002:adf:f709:: with SMTP id r9mr41456456wrp.8.1574863237945; Wed, 27 Nov 2019 06:00:37 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id o1sm19372284wrs.50.2019.11.27.06.00.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 06:00:37 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 27 Nov 2019 14:00:27 +0000 Message-Id: <20191127140030.7838-3-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191127140030.7838-1-ross.burton@intel.com> References: <20191127140030.7838-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 3/6] python: package .pyo files too 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org The manifest parsing code was only adding .py and .pyc paths to FILES, generalise the latter to .py? so it catches .pyo files too. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python_2.7.17.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/python/python_2.7.17.bb b/meta/recipes-devtools/python/python_2.7.17.bb index ef5d5644812..5807f63db44 100644 --- a/meta/recipes-devtools/python/python_2.7.17.bb +++ b/meta/recipes-devtools/python/python_2.7.17.bb @@ -218,7 +218,7 @@ python(){ d.appendVar('FILES_' + pypackage, ' ' + value) if include_pycs == '1': if value.endswith('.py'): - d.appendVar('FILES_' + pypackage, ' ' + value + 'c') + d.appendVar('FILES_' + pypackage, ' ' + value + '?') for value in python_manifest[key]['rdepends']: # Make it work with or without $PN From patchwork Wed Nov 27 14:00:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 180302 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp6157446ilf; Wed, 27 Nov 2019 06:01:02 -0800 (PST) X-Google-Smtp-Source: APXvYqwVyfHE9SOz6a8KaFqL4VlqPRdVDbmdaDnjayiTK8sBrMIm+l6DMC11vUbS79dF11R2HZ4a X-Received: by 2002:a62:e81a:: with SMTP id c26mr47518968pfi.246.1574863262566; Wed, 27 Nov 2019 06:01:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574863262; cv=none; d=google.com; s=arc-20160816; b=oRdeArTiGdXc0j+81d5AXQA47gZSLEt5NUf3VOOASzgXEtUYWWw4lR6ELMWaOc0AuO cQG4qa7upld/LkjaG9EXHqLdubBsj1S3VDaXYbbp3oJny5a21SEiIHQ7jctKpV5dDq84 miwiHKwya70tfE6CN/y+mF9e2apfHYDKHLJJU7OQud+FT+azN+9xtpFulj91Y+8sEHvz b5tSsRKkL/mqo3nhZTIS9paQTkZDUobUbsKvo4NgEBrolpiyX31xaeTknWrPKCKY68Bg 69MacBqXaePQCpYMXILdVJvSEHi7HaoJPehl7Fkqzt56/z6dRBw0mtdGzkgsrktEZirv 0wCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=JfweZQjXT82dBhobsdUzTgk55dcfy/KmDIHOs7Av75w=; b=jv7/h2U65D8Y/pBJjsudG2v84sApDFRdBG+r4aawFWjZolOS0Rmm4/LYO3/PEx0Wb/ 3VMZe4JrgTbYIGe6skGvRTkK6vmpAPWhgwOPWOW3R2ZDGhAeZNrosEHaaLKJ+UPeqM6Q B1Ir6qtDOvUDPEbUmpzfmnUu57bLbcwzsVg/G5AmYfUhIZR6FNnAyemPs/lA784D1R6E Gm/Z7QJlR+2TzCTzgfxZzhAGQ6Jj8PuQom/jw1AH6X+HGEarCM3pnz1X/3/pWe+qXgH7 QxLrn+fbLeEFnvacn54SD1nlZhtA4S0xZNbBU742GtbwbmNTGdyE24/lSP6c/iADajVE ILRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=B0ebvKiU; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id v16si2908487pfe.25.2019.11.27.06.01.02; Wed, 27 Nov 2019 06:01:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=B0ebvKiU; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 68D2F7FC1B; Wed, 27 Nov 2019 14:00:43 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mail.openembedded.org (Postfix) with ESMTP id 7BFD77FC0C for ; Wed, 27 Nov 2019 14:00:38 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id s5so26795182wrw.2 for ; Wed, 27 Nov 2019 06:00:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ySgwyLgna8TMpx2gOFCpckNX+8VS5FMlc9psqBwtLco=; b=B0ebvKiU6M000h/iGRMGDIyM/rq04v9GDrOdQLkIXP6X70nkKko2wnfzhiRDsrRwy9 4Xh1H28pL+DhVZ087wjZIKeet/JCNooc6MLpQ8P0gafgD0PaTDb6Cn0B79bBmPxjtGn1 jGuUNeJnlGagm4ZVd7GzhLR44l+HsG6sjK1hOpsTOXjnKLTdSM8cN7WDtgOj+/6N81Fk rrMsL1Wb39vk+FGJ359GP8KNXgmpFZG5OLdqFM6fLhzd0A3qKju0W0kBg3bQNZNwJH/X sZFoTrQpnqGmME5e3QW/lMeGCX/evtZ3oNu6wIS8FtUcQo0wbUyIBfyaQF44mF2S1VdH GMHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ySgwyLgna8TMpx2gOFCpckNX+8VS5FMlc9psqBwtLco=; b=ActmoTiY1IW+D5GkXNven6JgVIVya4/Eufcoco2Rr9LiPVy4fvnH9J000FZUNk6eN/ OZ0N86a8loHgHYw9aukoJ6192OFwaakoWiEBYjqubp7uMUxMLzkCVqt5ZnHR8ZGu2esj KegD5/dtJlyy7tkyJwB2QNJIiFJPxCw1a5Gu/SYw7GGECSdSv7GBG1QlDj58sLW7kW/W TQAEDP8xgZMSOjyaXd/QxLdcxSzIkmY3OUMgEsxxtC8IZ6fF2SVl2dBI30cQfLRKFsMl VidckOvWjrf7u0KddMRusWEZARzwOmMWMkBan9o2yO4IIQ2P5yqSwheEb4OTpvsAiBq7 k9SQ== X-Gm-Message-State: APjAAAUDnPxgWAGa5yTH9fghnxktjGZIVWWK2UJPLQh+L659FGsoSqSG DSCGIeHuXV4Ay7RGK9jqZGlc2tV9HZQ= X-Received: by 2002:a5d:5487:: with SMTP id h7mr1881351wrv.396.1574863239009; Wed, 27 Nov 2019 06:00:39 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id o1sm19372284wrs.50.2019.11.27.06.00.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 06:00:38 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 27 Nov 2019 14:00:28 +0000 Message-Id: <20191127140030.7838-4-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191127140030.7838-1-ross.burton@intel.com> References: <20191127140030.7838-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 4/6] python: restore bytecode optimisation 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org The upgrade from 2.7.3 to 2.7.9 in oe-core cb02ecb introduced some copy-paste errors which inadvertandly disabled the generation of optimised bytecode (.pyo files). Restore the intended behaviour and bring back .pyo files. Signed-off-by: Ross Burton --- .../python/python/01-use-proper-tools-for-cross-build.patch | 6 +++--- .../python/python/fix_for_using_different_libdir.patch | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch index 7d8e95fe5cc..56992210a23 100644 --- a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch +++ b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch @@ -36,18 +36,18 @@ Index: Python-2.7.13/Makefile.pre.in $(DESTDIR)$(LIBDEST) PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ ++ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST) -f \ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ $(DESTDIR)$(LIBDEST) -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ ++ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ ++ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ diff --git a/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch b/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch index 5f7309367c4..b4e72193ff8 100644 --- a/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch +++ b/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch @@ -52,8 +52,8 @@ Index: Python-2.7.9/Makefile.pre.in -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ $(DESTDIR)$(LIBDEST) - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH}$(RUNSHARED) \ - $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ ++ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ + $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST) -f \ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ $(DESTDIR)$(LIBDEST) @@ -64,7 +64,7 @@ Index: Python-2.7.9/Makefile.pre.in -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ - $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ + $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ From patchwork Wed Nov 27 14:00:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 180303 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp6157727ilf; Wed, 27 Nov 2019 06:01:12 -0800 (PST) X-Google-Smtp-Source: APXvYqzGFeZgLOm3VBwxjoOOypSemqCBcuZSUOTBa3+xVC0RbE4Pxd3NSX+/izh60232ouXsOtJt X-Received: by 2002:a63:215d:: with SMTP id s29mr4748483pgm.200.1574863272811; Wed, 27 Nov 2019 06:01:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574863272; cv=none; d=google.com; s=arc-20160816; b=vYp8HTAzzUoIgpYWrWM3FC7lQ51fxzhivMq26o/K5ozD3O5zG6aKfARaH5he2vG2ek PgTd224u3ECtJ0TM5nGDvhB4kZGT/o2b93Umpbiq40AIYFwy+yyxpDtASmj+wkpg0GtE io+9icrkGb1p51X9KFKRWe1hxh9T/PpHfD7eNYgVesbqP/gCI+4a4VQ5H4WDCatKqD72 dhtXRchVHQjcaZQmHGsXHzukOZznsjFWW4hW06qCNQDXrLy06rbS8X39cx08xrtYVUTu 6Kr87PYHywkRiaX2hf6Z/8n9tHcnhreThptSYhbncPDEaxziK1TbB3SlRPEQKThP+u3E UVmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=qSR+Evl89fp4VZ4i54+mTuZSNos+XWKDGOZNsi0Z9MQ=; b=YHmBNmHt2tfSG1WpKQoqMqa9q9oEstXpudTgW63h5EFP7NjWh3m0eRyzljOovAeQaj P8ObfocwWeOvoiVbF1TtQcRPsg4KEv65clFXdqlIFdEwycwGz0YcglYPWTHU9ZDakfcM EMJI2UOOoYMFOMvfZnuRWAaApnediEFViGG8u2nJHRJnOkHtfGZf5muQMfDrzukWIgrl mNLWuc0olW6TB+zFgivtNwe0Sr00bhHidwy+S/WavxYBXED3NvCfAVANUBeHIsyJAA7B PGbqj9zW7PFNW/SlBZGfvJWUqSaPY78ZSBbxo1xpGSw9x0Clo06JxQ8ydBoZ4a/AcVb2 WyYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=Ta02t7pn; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id t15si4101431pgj.144.2019.11.27.06.01.12; Wed, 27 Nov 2019 06:01:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=Ta02t7pn; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A6F6B7FC1C; Wed, 27 Nov 2019 14:00:51 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mail.openembedded.org (Postfix) with ESMTP id AB0707FBD7 for ; Wed, 27 Nov 2019 14:00:40 +0000 (UTC) Received: by mail-wr1-f49.google.com with SMTP id c14so2193498wrn.7 for ; Wed, 27 Nov 2019 06:00:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=8zKfG5ZXpM+6pE/aTfcBNnKvKdhltC6rkm+C0JyEkb8=; b=Ta02t7pnl5Ze0/+dXNmutFuhknGUl++KdAji5DaAbG2dVvzNcV0kt1t4KvZIMG8jmq ev8Zo4+KfVK23bk0hiq00mSoGHDoef7MpNvDO5x1eDHe54/AB0zA0cSAosGDm4tEuoh8 HNoc88ea2WYBeA+aMVBGVgxDPdqSIORavEeH+6W/UIppuG9cHwa2nslOj7YkGggU6uN1 QGQKlV7dDUYrgkYP+CUMRkI2D+spR7kNl1KZyTiDyA7h2wn7ZxnI8jeVS5tdZ3/0QOX/ 5Vt/oOQ6KUXitTPR0aVB6SCKUiJvQh1VXCFfEtnlM/fKLChMsXK8OgdI9IcmwTp4MyuU Xrog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8zKfG5ZXpM+6pE/aTfcBNnKvKdhltC6rkm+C0JyEkb8=; b=d9jrcBWId3lu2J+qFnEzJwj7PAW0bR5FQJW/+inyy49kJXa8VNZU7+N4t01mA4nppQ fwQyL+zw/0MNyMGflj3B+H0KbFJSFcfKFFsuuERfhSDLZhGnIAzq/AkmO0QR9/pNp8C1 9C1BrLdsApMBq/C7KhFJxWq0ppjW7JbCGJHYk01O0/H0P4tF5iMLopmkwg60dFRprPeO 6QBCHdXtAH+3fTHsH7LuJhkrc6xiLSfWy0YvHJ3HJSSUwVbTgX9MsuZp7eFTklgYzMUO 5kvgzCRPi1QvbTIH0dUt9GhkaGig+qrfMK1+AyOOMofFdr8P3q+7aoYVFeCO8IyRK8Zg 0tww== X-Gm-Message-State: APjAAAV5VNBqO50+zYf6hUC9SOwvxob34Qj3UM4I08F5rxeRPnV4m1pf kVw0qVI3PYRF/A4hHyDa/f6ElLwPTsQ= X-Received: by 2002:adf:da52:: with SMTP id r18mr42812199wrl.167.1574863239892; Wed, 27 Nov 2019 06:00:39 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id o1sm19372284wrs.50.2019.11.27.06.00.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 06:00:39 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 27 Nov 2019 14:00:29 +0000 Message-Id: <20191127140030.7838-5-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191127140030.7838-1-ross.burton@intel.com> References: <20191127140030.7838-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 5/6] python: use correct autotools variables 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Use EXTRA_OECONF and CACHED_CONFIGUREVARS as nature intended. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python_2.7.17.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/python/python_2.7.17.bb b/meta/recipes-devtools/python/python_2.7.17.bb index 5807f63db44..b3bdcba1a89 100644 --- a/meta/recipes-devtools/python/python_2.7.17.bb +++ b/meta/recipes-devtools/python/python_2.7.17.bb @@ -36,9 +36,11 @@ S = "${WORKDIR}/Python-${PV}" inherit autotools multilib_header python-dir pythonnative ptest -CONFIGUREOPTS += " --with-system-ffi " +EXTRA_OECONF += "--with-system-ffi" -EXTRA_OECONF += "ac_cv_file__dev_ptmx=yes ac_cv_file__dev_ptc=no ac_cv_working_tzset=yes" +CACHED_CONFIGUREVARS = "ac_cv_file__dev_ptmx=yes \ + ac_cv_file__dev_ptc=no \ + ac_cv_working_tzset=yes" PACKAGECONFIG ??= "bdb" PACKAGECONFIG[bdb] = ",,db" From patchwork Wed Nov 27 14:00:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 180304 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp6157955ilf; Wed, 27 Nov 2019 06:01:21 -0800 (PST) X-Google-Smtp-Source: APXvYqx+hVfeJsnMDSF46ONkwgRkTQQWb2Cih3GBUtRECnr7/Nxh8B9Bt7WPRYO4UIj8/qI2/v7Y X-Received: by 2002:a17:90a:1089:: with SMTP id c9mr6356694pja.8.1574863281122; Wed, 27 Nov 2019 06:01:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574863281; cv=none; d=google.com; s=arc-20160816; b=BfyyJ60xzXej5Qi5UydyK31/AlpaGEyqcf7h2RU7nwZvHkGgCu+nZSbCz9UWkXhTWm O62naTrhn5tT9OVO9N+hE/miRCjny2+pb7s4EYFmT5O/JXgTz1W5YVMjJ+RfRs5kxnm2 APjooZ01M23kbgUXJ+cH5CaU8blwMyDiCpE7TxYHRmFGwZE5DOLwfx3XS/zc52puTUcE 2xJvbwelInYSncRT+UsQYTGM/fWAWjz1hO2E5kCrXYcjBzY0ug/LgkrSFH3OgddRdYUi fADfA3IAS6DCROxraDIwtjVcPNdr+nac6fTkYo1BtYTQDecRHTggcd0x0JfkKmtG8wJB 9JUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=HLIg/TnEblBfIhN/JVSvoY7OtaSZozUdojAQE88pnPM=; b=b7L6v7evbx1b8yPzVSRBeea1wvcSXnPSzxb9ZkqRBTlwdviInvT5SC7IcYEbAefad1 jGVQ3RcteCLoublovO4MtbZ2Z22sam20MLWf93mU8edkvaaB9Y21+Y4uIgVqbQap+6Zy FDdffXJPAcKID0e8HHhpxNjoOe9D3FPBhVYTTlz/Ko1sQr9KxKrPFCzPsFwG8eqTulzl os67Zglhc9GGusYTiyAtM/yMGD8Y1+5hMGN+pkjvMaYjApJDm51Zi6RrQWSriuFRT0Pn bmcJKjlVo6qeiZo8Crp5vy5JnYBJSQ62u6SHjBqMCMNcwDEWvWT6DM1aITibEHyIOpSG 9Tuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=hkkDScN0; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b20si14252974pgl.118.2019.11.27.06.01.20; Wed, 27 Nov 2019 06:01:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=hkkDScN0; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E82847FC5D; Wed, 27 Nov 2019 14:00:52 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mail.openembedded.org (Postfix) with ESMTP id DAAAF7FC33 for ; Wed, 27 Nov 2019 14:00:40 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id z3so26792011wru.3 for ; Wed, 27 Nov 2019 06:00:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=KGGzqCS/VKikJ16p1Wa12d9ZWIUeUVYWghVbO5fR1ck=; b=hkkDScN0VHqaqmov63kF9vWleU5ZS7wCE/jLys22deO7aLyGKD7/LNN/kWLPnzjXNf WQSrEIpR73aAjVhLlBrGb1fwKp/Aqo5+0TUH85lYY2z/evFhwB1SEVI7EgK1BTTDzrsm +/CpzTb23VbSNeeWU9VxIndio2DoDpuA3t9dw9+zfDaRXydD8fo+N4vslh3niqHCWbWp kTSahx5l6n3DSWLnyULfxSmK6nH6GseeGk2VXczZ8TZPAHKqvrfw470oiEWWAwoeiC0c Cszumw9jt2ve5lasEFjgExbfjPqzdR/1/i1sHrcvgyHI4mXCU0ypBzRJcyBh5DcSLtbk ve8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KGGzqCS/VKikJ16p1Wa12d9ZWIUeUVYWghVbO5fR1ck=; b=awSw1X4p2Ok9aYNdIaUhmenbP14Wn9bTDmp7XNCaR3dP2Xl8E1n5QYnxzKZoQzHVJ1 nr9+8b7ZiS8qibZPEyocW6LyizUh7sBmDVE3XWNy2l6++rsinOJMYFN7pUKu8FYy7jOe UKEX24lPK6rHvl+mqaBzcfYZVmQIKVqAnJi/Av/+/bvzKwj1JpEGbk5V25pQfeV4gF6v zVqNaUJq2aBGiqX6qiXGS8FqvcdMkBE8FPg8O7Z4kSTsU0f+xm0nVRCQ+/1qyzzwkrdH 89CCcm8+L9g4S5BPIldhUlg6uOVmtJEquRKc1WvPLaqTOEa8B3tZR+nFCzMbdIKzGPUx YNAw== X-Gm-Message-State: APjAAAXZnE6vzcYeWSu9GdrhECXVVAYgk5XPofC/kkvOmPzfzU0TADI3 vbr7/7gO4H8gYJxjDqFcdV4Snr32dDA= X-Received: by 2002:a05:6000:104:: with SMTP id o4mr12264757wrx.309.1574863241228; Wed, 27 Nov 2019 06:00:41 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id o1sm19372284wrs.50.2019.11.27.06.00.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 06:00:40 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 27 Nov 2019 14:00:30 +0000 Message-Id: <20191127140030.7838-6-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191127140030.7838-1-ross.burton@intel.com> References: <20191127140030.7838-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 6/6] python: use PYTHON_FOR_BUILD, don't add HOSTPYTHON 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org There's already a variable for "the host python to use during the build when cross-compiling", so there's no need to add another. Signed-off-by: Ross Burton --- .../01-use-proper-tools-for-cross-build.patch | 34 ------------------- .../fix_for_using_different_libdir.patch | 14 ++++---- meta/recipes-devtools/python/python_2.7.17.bb | 3 +- 3 files changed, 8 insertions(+), 43 deletions(-) -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch index 56992210a23..b02c09458f1 100644 --- a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch +++ b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch @@ -25,40 +25,6 @@ Index: Python-2.7.13/Makefile.pre.in # Create build directory and generate the sysconfig build-time data there. # pybuilddir.txt contains the name of the build dir and is used for -@@ -1121,27 +1122,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL - $(DESTDIR)$(LIBDEST)/distutils/tests ; \ - fi - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -+ $(HOSTPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt -+ $(HOSTPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt - - # Create the PLATDIR source directory, if one wasn't distributed.. - $(srcdir)/Lib/$(PLATDIR): Index: Python-2.7.13/setup.py =================================================================== --- Python-2.7.13.orig/setup.py diff --git a/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch b/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch index b4e72193ff8..d41b6cfc744 100644 --- a/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch +++ b/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch @@ -41,37 +41,37 @@ Index: Python-2.7.9/Makefile.pre.in =================================================================== --- Python-2.7.9.orig/Makefile.pre.in +++ Python-2.7.9/Makefile.pre.in -@@ -1046,27 +1046,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL +@@ -1037,27 +1037,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ - $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ + $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST) -f \ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ $(DESTDIR)$(LIBDEST) - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ - $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ + $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST) -f \ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ $(DESTDIR)$(LIBDEST) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ - $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ + $(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ - $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ + $(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ - $(HOSTPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt + $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ - $(HOSTPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt + $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt # Create the PLATDIR source directory, if one wasn't distributed.. diff --git a/meta/recipes-devtools/python/python_2.7.17.bb b/meta/recipes-devtools/python/python_2.7.17.bb index b3bdcba1a89..be7c6d2d2bf 100644 --- a/meta/recipes-devtools/python/python_2.7.17.bb +++ b/meta/recipes-devtools/python/python_2.7.17.bb @@ -1,6 +1,6 @@ require python.inc -DEPENDS = "python-native libffi bzip2 gdbm openssl \ +DEPENDS = "libffi bzip2 gdbm openssl \ readline sqlite3 zlib virtual/crypt" DISTRO_SRC_URI ?= "file://sitecustomize.py" @@ -48,7 +48,6 @@ PACKAGECONFIG[tk] = ",,tk" # pgen isn't needed in the current build, but use the binary from python-native just in case. EXTRA_OEMAKE = "PGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \ CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \ STAGING_LIBDIR=${STAGING_LIBDIR} \ STAGING_INCDIR=${STAGING_INCDIR} \