Date: Thu, 17 Feb 2022 21:33:35 +0100
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Peter Korsgaard <peter@korsgaard.com>
Message-ID: <20220217203335.GG522310@scaer>
References: <20220217182202.11640-1-peter@korsgaard.com>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <20220217182202.11640-1-peter@korsgaard.com>
User-Agent: Mutt/1.5.22 (2013-10-16)
Subject: Re: [Buildroot] [PATCH] package/pkg-python.mk: drop references to
 PYTHON_{PATH, DIR}
Precedence: list
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>, buildroot@buildroot.org
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: buildroot-bounces@buildroot.org
Sender: "buildroot" <buildroot-bounces@buildroot.org>

Peter, All,

On 2022-02-17 19:21 +0100, Peter Korsgaard spake thusly:
> With python 2.x support dropped these variables no longer exist, so
> unconditionally use the python3 variant.
> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/pkg-python.mk | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/package/pkg-python.mk b/package/pkg-python.mk
> index 02df061a19..b8dc9cd9e5 100644
> --- a/package/pkg-python.mk
> +++ b/package/pkg-python.mk
> @@ -38,10 +38,10 @@ PKG_PYTHON_DISTUTILS_ENV = \
>  	PATH=$(BR_PATH) \
>  	$(TARGET_CONFIGURE_OPTS) \
>  	LDSHARED="$(TARGET_CROSS)gcc -shared" \
> -	PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \
> +	PYTHONPATH="$(PYTHON3_PATH)" \
>  	PYTHONNOUSERSITE=1 \
>  	_PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \
> -	_PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \
> +	_PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \
>  	_PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \
>  	_python_sysroot=$(STAGING_DIR) \
>  	_python_prefix=/usr \
> @@ -70,11 +70,11 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \
>  # Target setuptools-based packages
>  PKG_PYTHON_SETUPTOOLS_ENV = \
>  	_PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \
> -	_PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \
> +	_PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \
>  	_PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \
>  	PATH=$(BR_PATH) \
>  	$(TARGET_CONFIGURE_OPTS) \
> -	PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \
> +	PYTHONPATH="$(PYTHON3_PATH)" \
>  	PYTHONNOUSERSITE=1 \
>  	_python_sysroot=$(STAGING_DIR) \
>  	_python_prefix=/usr \
> -- 
> 2.20.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot