From 27aee1fbf09a6230836d191d1138c9ed805373eb Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Tue, 15 Dec 2020 11:07:21 +0200 Subject: [PATCH] python3: introduce libpython3 with ABI_VERSION flag Related to discussion: https://github.com/openwrt/packages/pull/14060 Every once in a while a version bump will occur that requires an ABI change. Example: Python 3.8 to 3.9. When this happens some Python packages would need to be rebuilt. In setups where everything gets rebuilt, this isn't a problem. It's usually a bigger problem when needing to upgrade something via opkg. To accommodate for this, we add a libpython with it's own ABI_VERSION flag. If this ABI_VERSION changes, then this should propagate forward. Signed-off-by: Alexandru Ardelean --- lang/python/python3/Makefile | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index 6405376aaf..0975b86c7d 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:=1 +PKG_RELEASE:=2 PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO) PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz @@ -66,10 +66,21 @@ define Package/python3/Default/description the development of higher quality, more maintainable code. endef +define Package/libpython3 +$(call Package/python3/Default) + TITLE:=Python $(PYTHON3_VERSION) core library + DEPENDS:=+libpthread +zlib + ABI_VERSION:=$(PYTHON3_VERSION) +endef + +define Package/libpython3/description + This package contains only core Python library. +endef + define Package/python3-base $(call Package/python3/Default) TITLE:=Python $(PYTHON3_VERSION) interpreter - DEPENDS:=+libpthread +zlib + DEPENDS:=+libpthread +zlib +libpython3 endef define Package/python3-base/description @@ -269,13 +280,16 @@ define Py3Package/python3-light/filespec $(subst $(space),$(newline),$(foreach lib_file,$(PYTHON3_LIB_FILES_DEL),-|$(lib_file))) endef -define Py3Package/python3-base/install +define Package/libpython3/install # Adding the lib-dynload folder (even just empty) suppresses 2 warnings when starting Python $(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON3_VERSION).so* $(1)/usr/lib/ +endef + +define Py3Package/python3-base/install $(INSTALL_DIR) $(1)/usr/bin $(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 @@ -357,6 +371,8 @@ $(foreach package, $(PYTHON3_PACKAGES), \ $(eval $(call BuildPackage,$(package)-src)) \ ) +$(eval $(call BuildPackage,libpython3)) + $(eval $(call Py3Package,python3-base)) $(eval $(call Py3Package,python3-light)) $(eval $(call Py3Package,python3)) -- 2.30.2