diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2020-04-27 14:10:53 +0800 |
|---|---|---|
| committer | Jeffery To <jeffery.to@gmail.com> | 2020-04-27 14:10:53 +0800 |
| commit | 9f81ab895eca0709d1a7b4804b36a5cd00b4f368 (patch) | |
| tree | 2c4fbe3ad0e53969eb0e06959647ce5d0b60f1ff /lang | |
| parent | 231cd05013e5ab23cc92469171e848cfae2e5ce4 (diff) | |
python3: Fix host build tool names recorded in target files
Python will record the values of CC, CXX, AR, and READELF (and other
configure options) used during compilation. pip will use these programs
when asked to compile extension modules on the target device.
* If ccache is used during build, CC and CXX will be ccache_cc and
ccache_cxx, respectively, which are not available on-device (#11912).
* If an external toolchain is used during build, the values of these
variables will contain the external toolchain prefix, which may not be
available on target.
* If the normal toolchain is used during build, AR and READELF will
contain the toolchain prefix, but the names of ar and readelf
on-device do not contain the prefix; they are named "ar" and
"readelf".
This changes the values of these variables in Python's files to match
the names available on-device, and without any toolchain prefix.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/python/python3/Makefile | 8 | ||||
| -rw-r--r-- | lang/python/python3/files/python3-package-dev.mk | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index 627a1d3a6..9d5206f1b 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk include ../python3-version.mk PKG_NAME:=python3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO) PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz @@ -125,6 +125,9 @@ define Package/python3/description It's python3-light + all other packages. endef +TARGET_CONFIGURE_OPTS+= \ + READELF="$(TARGET_CROSS)readelf" + MAKE_FLAGS+=\ CROSS_COMPILE=yes \ LD="$(TARGET_CC)" @@ -282,6 +285,9 @@ define Py3Package/python3-base/install $(LN) python$(PYTHON3_VERSION) $(1)/usr/bin/python3 $(LN) python$(PYTHON3_VERSION) $(1)/usr/bin/python $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON3_VERSION).so* $(1)/usr/lib/ + # This depends on being called before filespec is processed + $(SED) 's|$(TARGET_AR)|ar|g;s|$(TARGET_CROSS)readelf|readelf|g;s|$(TARGET_CC)|gcc|g;s|$(TARGET_CXX)|g++|g' \ + $(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON3_VERSION)/_sysconfigdata.py endef Py3Package/python3-light/install:=: diff --git a/lang/python/python3/files/python3-package-dev.mk b/lang/python/python3/files/python3-package-dev.mk index 12ceceab7..b23654876 100644 --- a/lang/python/python3/files/python3-package-dev.mk +++ b/lang/python/python3/files/python3-package-dev.mk @@ -16,6 +16,9 @@ define Py3Package/python3-dev/install $(CP) $(PKG_INSTALL_DIR)/usr/bin/python$(PYTHON3_VERSION)-config $(1)/usr/bin $(LN) python$(PYTHON3_VERSION)-config $(1)/usr/bin/python3-config $(LN) python$(PYTHON3_VERSION)/config-$(PYTHON3_VERSION)/libpython$(PYTHON3_VERSION).a $(1)/usr/lib/ + # This depends on being called before filespec is processed + $(SED) 's|$(TARGET_AR)|ar|g;s|$(TARGET_CROSS)readelf|readelf|g;s|$(TARGET_CC)|gcc|g;s|$(TARGET_CXX)|g++|g' \ + $(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON3_VERSION)/config-$(PYTHON3_VERSION)/Makefile endef $(eval $(call Py3BasePackage,python3-dev, \ |