From c766386f3d04a66c7d0900b9641217e75a45239e Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Thu, 18 May 2023 17:42:12 +0800 Subject: [PATCH] python3: Fix readelf program name not replaced in _sysconfigdata.py The Makefile lines to add READELF to TARGET_CONFIGURE_OPTS was removed in 4e05541782edeb06b51d691dadf52648df24c940. Without setting READELF, configure finds the symlink to $(TARGET_CROSS)readelf (e.g. arm-openwrt-linux-readelf) instead of $(TARGET_CROSS)readelf (e.g. arm-openwrt-linux-muslgnueabi-readelf). This leads to the symlink name being saved to _sysconfigdata.py, and so the readelf name is not replaced correctly (in Py3Package/python3-base/install). This restores the removed Makefile lines. Fixes: 4e05541782ed ("python3: bump to version 3.10.0") Signed-off-by: Jeffery To (cherry picked from commit e1a95786358c64483fc16d52eac6746267f0abec) --- lang/python/python3/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index 28d80b00de..eb2c4c8b26 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:=6 +PKG_RELEASE:=7 PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO) PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz @@ -138,6 +138,11 @@ define Package/python3/description It's python3-light + all other packages. endef +# Set READELF here so that the exact same readelf program name can be +# replaced in _sysconfigdata.py (in Py3Package/python3-base/install) +TARGET_CONFIGURE_OPTS+= \ + READELF="$(TARGET_CROSS)readelf" + EXTRA_LDFLAGS+= \ -L$(PKG_BUILD_DIR) \ -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -- 2.30.2