From 5bea8c9521b3fbfdf40030635989064af55cc26c Mon Sep 17 00:00:00 2001 From: Emile Cormier Date: Wed, 30 Mar 2022 16:45:21 -0600 Subject: [PATCH] package/pkg-python.mk: fix PEP517 paths Use /usr target/staging prefix and / host prefix. This allows the Python interpreter to find packages built via the new Flit infrastructure. Fixes: #14721 Signed-off-by: Emile Cormier Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 52ce402281..867341fc7b 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -127,16 +127,16 @@ PKG_PYTHON_PEP517_ENV = \ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(TARGET_DIR)/usr/bin \ --data=$(TARGET_DIR)/usr PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(STAGING_DIR)/usr/bin \ --data=$(STAGING_DIR)/usr @@ -147,12 +147,12 @@ HOST_PKG_PYTHON_PEP517_ENV = \ $(HOST_CONFIGURE_OPTS) HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ - --interpreter=/usr/bin/python \ + --interpreter=/bin/python \ --script-kind=posix \ --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(HOST_DIR)/usr/bin \ - --data=$(HOST_DIR)/usr + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(HOST_DIR)/bin \ + --data=$(HOST_DIR) ################################################################################ # inner-python-package -- defines how the configuration, compilation