From patchwork Sun Jun 23 21:23:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1120929 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lzog+mmd"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45X55Z6Ymjz9s00 for ; Mon, 24 Jun 2019 07:24:02 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D4D2081726; Sun, 23 Jun 2019 21:23:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6wDAtDjJh3Se; Sun, 23 Jun 2019 21:23:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A680181D83; Sun, 23 Jun 2019 21:23:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E513F1BF3ED for ; Sun, 23 Jun 2019 21:23:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C296C8543B for ; Sun, 23 Jun 2019 21:23:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Jmdj2A629-e5 for ; Sun, 23 Jun 2019 21:23:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 76DBF85421 for ; Sun, 23 Jun 2019 21:23:49 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id w25so870228ioc.8 for ; Sun, 23 Jun 2019 14:23:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9m6JJkKLXdJ+6K5kqMZlFLSG7V5pxpTbl/ozJMDAaeE=; b=lzog+mmdZhw7VZSowTOmIzTkcQsJyELoLnmj9S1vkpWTqVaH60CgiPXzP1FBO4kVHf yvBiROfqs1mvGRfunXZHZSC6UQuiXEiaSE+ZyBOncbLyAwiykSlQ5p/koL7WDmYgAwiC FuUoiPvjmR78QRTSbpoXwSIEXC9aV/L3+RltExJyYzpnVwYcByh/h574edUL8rYGmuqd I8HGvaqvIeZPxIlWzunkTzFMZzh1h2mK/0bJ+8aooDixjbKooVpYkXHOfLMsNg6sPBSQ ThUV5fjIHqEiGWvgBIELrOv+tfua00tinB5hQtlPsqrCKsGLOEaV5qD//TWIeMah+Fgm rtEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9m6JJkKLXdJ+6K5kqMZlFLSG7V5pxpTbl/ozJMDAaeE=; b=ASrmVqYU9zeqZfpkF3cUxrCIh5XJPPJN3jtNAPavaVmRhJ1UIAZnRTHVqi51ZZdxxf 5DrQXSekHf30p1Y4Getu8dojLZJxv1w6Zk93JWW+1lqOguJH7pQihs2Gj1Ks+636PxOg hBCTRGyUz6gdv5G84h/B8XeKrk9ZzFvDZLDA5XXZhWtc1LeV/lEK98myow9MEsGIpOki HmmvzyeRUO+Ggm+cfiGOASXq/9Jrgc7UQ//C0R1CaVOxkvmNtVViCWmracLIItw6szNb jUu4UIrMnFjk2PSXeQ7fOQ+CPLyP3ygWxY+A8xjPATBpdPNl8iWoG3ehAWSfoG6vvbO8 JC9g== X-Gm-Message-State: APjAAAVIlQ68yHzpGfEyQEjJnMQ3p0BxRdBbAP0caOYhGTh8c10O4Bkv PRMqOpEsEAWFe7IYW2g+xOsb/E61 X-Google-Smtp-Source: APXvYqwBvFZf/+ATntagKV3b1tE6vq4Xn6ll98V4D41tSjnbNn0YOjN7WVbOal3Bn6UFFK2f40iNsQ== X-Received: by 2002:a02:554a:: with SMTP id e71mr20816140jab.144.1561325028513; Sun, 23 Jun 2019 14:23:48 -0700 (PDT) Received: from localhost.localdomain (68-188-149-81.dhcp.aldl.mi.charter.com. [68.188.149.81]) by smtp.gmail.com with ESMTPSA id p25sm11148250iol.48.2019.06.23.14.23.47 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 23 Jun 2019 14:23:48 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Sun, 23 Jun 2019 17:23:40 -0400 Message-Id: <20190623212342.41809-5-aduskett@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190623212342.41809-1-aduskett@gmail.com> References: <20190623212342.41809-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v12 4/6] package/meson: prevent python include path manipulation X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yann.morin.1998@free.fr, Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett From: https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-devtools/meson/meson/ Meson exports a bunch of PKG_CONFIG_ variables which causes a double prefix for the staging python include directory. Signed-off-by: Adam Duskett --- Changes v11 -> v12: - Remove accidental copy and paste in the commit message. Changes v1 -> v11: - Add this patch to the series ...-environment-when-calling-pkg-config.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/meson/0002-python-module-do-not-manipulate-the-environment-when-calling-pkg-config.patch diff --git a/package/meson/0002-python-module-do-not-manipulate-the-environment-when-calling-pkg-config.patch b/package/meson/0002-python-module-do-not-manipulate-the-environment-when-calling-pkg-config.patch new file mode 100644 index 0000000000..89a6830c67 --- /dev/null +++ b/package/meson/0002-python-module-do-not-manipulate-the-environment-when-calling-pkg-config.patch @@ -0,0 +1,48 @@ +From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 19 Nov 2018 14:24:26 +0100 +Subject: [PATCH] python module: do not manipulate the environment when calling pkg-config + +From: https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-devtools/meson/meson/ + +Meson exports a bunch of PKG_CONFIG_ variables which causes a double prefix to +the python include directory. + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Alexander Kanavin +Signed-off-by: Adam Duskett + +--- + mesonbuild/modules/python.py | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py +index 9cfbd6f..3ff687a 100644 +--- a/mesonbuild/modules/python.py ++++ b/mesonbuild/modules/python.py +@@ -75,11 +75,6 @@ class PythonDependency(ExternalDependency): + old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR') + old_pkg_path = os.environ.get('PKG_CONFIG_PATH') + +- os.environ.pop('PKG_CONFIG_PATH', None) +- +- if pkg_libdir: +- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir +- + try: + self.pkgdep = PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs) + mlog.debug('Found "python-{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_version, pkg_libdir)) +@@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency): + mlog.debug('"python-{}" could not be found in LIBPC ({})'.format(pkg_version, pkg_libdir)) + mlog.debug(e) + +- if old_pkg_path is not None: +- os.environ['PKG_CONFIG_PATH'] = old_pkg_path +- +- if old_pkg_libdir is not None: +- os.environ['PKG_CONFIG_LIBDIR'] = old_pkg_libdir +- else: +- os.environ.pop('PKG_CONFIG_LIBDIR', None) + else: + mlog.debug('"python-{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_version, pkg_libdir)) +