| Message ID | 20220217182202.11640-1-peter@korsgaard.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/pkg-python.mk: drop references to PYTHON_{PATH, DIR} | expand |
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
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 \
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> --- package/pkg-python.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)