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) \