mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -20,16 +20,16 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
define PKG_PYTHON_SYSCONFIGDATA_NAME
|
||||
$(basename $(notdir $(wildcard $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/_sysconfigdata_m_linux_*.py)))
|
||||
endef
|
||||
# basename does not evaluate if a file exists, so we must check to ensure
|
||||
# the _sysconfigdata__linux_*.py file exists. The "|| true" is added to return
|
||||
# an empty string if the file does not exist.
|
||||
PKG_PYTHON_SYSCONFIGDATA_PATH = $(PYTHON3_PATH)/_sysconfigdata__linux_*.py
|
||||
PKG_PYTHON_SYSCONFIGDATA_NAME = `{ [ -e $(PKG_PYTHON_SYSCONFIGDATA_PATH) ] && basename $(PKG_PYTHON_SYSCONFIGDATA_PATH) .py; } || true`
|
||||
|
||||
# Target distutils-based packages
|
||||
PKG_PYTHON_DISTUTILS_ENV = \
|
||||
PATH=$(BR_PATH) \
|
||||
CC="$(TARGET_CC)" \
|
||||
CFLAGS="$(TARGET_CFLAGS)" \
|
||||
LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
LDSHARED="$(TARGET_CROSS)gcc -shared" \
|
||||
PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \
|
||||
PYTHONNOUSERSITE=1 \
|
||||
@@ -52,7 +52,8 @@ PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \
|
||||
# Host distutils-based packages
|
||||
HOST_PKG_PYTHON_DISTUTILS_ENV = \
|
||||
PATH=$(BR_PATH) \
|
||||
PYTHONNOUSERSITE=1
|
||||
PYTHONNOUSERSITE=1 \
|
||||
$(HOST_CONFIGURE_OPTS)
|
||||
|
||||
HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \
|
||||
--prefix=$(HOST_DIR)
|
||||
@@ -61,6 +62,7 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \
|
||||
PKG_PYTHON_SETUPTOOLS_ENV = \
|
||||
_PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \
|
||||
PATH=$(BR_PATH) \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \
|
||||
PYTHONNOUSERSITE=1 \
|
||||
_python_sysroot=$(STAGING_DIR) \
|
||||
@@ -82,13 +84,22 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \
|
||||
# Host setuptools-based packages
|
||||
HOST_PKG_PYTHON_SETUPTOOLS_ENV = \
|
||||
PATH=$(BR_PATH) \
|
||||
PYTHONNOUSERSITE=1
|
||||
PYTHONNOUSERSITE=1 \
|
||||
$(HOST_CONFIGURE_OPTS)
|
||||
|
||||
HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \
|
||||
--prefix=$(HOST_DIR) \
|
||||
--root=/ \
|
||||
--single-version-externally-managed
|
||||
|
||||
ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
|
||||
define PKG_PYTHON_FIXUP_SYSCONFIGDATA
|
||||
find $(HOST_DIR)/lib/python* $(STAGING_DIR)/usr/lib/python* \
|
||||
-name "_sysconfigdata*.py" | xargs --no-run-if-empty \
|
||||
$(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g"
|
||||
endef
|
||||
endif
|
||||
|
||||
################################################################################
|
||||
# inner-python-package -- defines how the configuration, compilation
|
||||
# and installation of a Python package should be done, implements a
|
||||
@@ -233,6 +244,8 @@ $(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/$$($(2)_NEEDS_HOST_PYTHON)
|
||||
endif
|
||||
endif
|
||||
|
||||
$(2)_PRE_CONFIGURE_HOOKS += PKG_PYTHON_FIXUP_SYSCONFIGDATA
|
||||
|
||||
#
|
||||
# Build step. Only define it if not already defined by the package .mk
|
||||
# file.
|
||||
|
||||
Reference in New Issue
Block a user