diff options
Diffstat (limited to 'package/python3')
| -rw-r--r-- | package/python3/Makefile | 74 | ||||
| -rw-r--r-- | package/python3/patches/patch-setup_py | 11 | 
2 files changed, 34 insertions, 51 deletions
| diff --git a/package/python3/Makefile b/package/python3/Makefile index 04a7402b9..bbe408591 100644 --- a/package/python3/Makefile +++ b/package/python3/Makefile @@ -4,24 +4,20 @@  include ${ADK_TOPDIR}/rules.mk  PKG_NAME:=		python3 -PKG_VERSION:=		3.8.2 +PKG_VERSION:=		3.13.8  PKG_RELEASE:=		1 -PKG_HASH:=		2646e7dc233362f59714c6193017bb2d6f7b38d6ab4a0cb5fbac5c36c4d845df -PKG_DESCR:=		python3 scripting language +PKG_HASH:=		b9910730526b298299b46b35595ced9055722df60c06ad6301f6a4e2c728a252 +PKG_DESCR:=		python scripting language  PKG_SECTION:=		dev/lang -PKG_DEPENDS:=		libffi -PKG_BUILDDEP:=		python3-host libffi  -HOST_BUILDDEP:=		libffi-host libressl-host +PKG_DEPENDS:=		libffi zlib libexpat +PKG_BUILDDEP:=		python3-host libffi zlib expat +HOST_BUILDDEP:=		libffi-host openssl-host zlib-host bzip2-host ncurses-host sqlite-host  PKG_NEEDS:=		threads  PKG_URL:=		http://www.python.org/  PKG_SITES:=		http://legacy.python.org/ftp/python/${PKG_VERSION}/ -PKG_HOST_DEPENDS:=	!netbsd !openbsd !cygwin - -PKG_FLAVOURS_PYTHON3:=	MOD_ZLIB MOD_BZ2 MOD_EXPAT MOD_SQLITE MOD_GDBM -PKG_FLAVOURS_PYTHON3+=	MOD_NCURSES MOD_SSL  -# disabled -#MOD_READLINE +PKG_FLAVOURS_PYTHON3:=	MOD_ZLIB MOD_BZ2 MOD_SQLITE MOD_GDBM +PKG_FLAVOURS_PYTHON3+=	MOD_NCURSES MOD_OPENSSL MOD_READLINE  PKGFD_MOD_ZLIB:=	zlib support  PKGFB_MOD_ZLIB:=	zlib @@ -29,9 +25,6 @@ PKGFS_MOD_ZLIB:=	zlib  PKGFD_MOD_BZ2:=		bzip2 support  PKGFB_MOD_BZ2:=		bzip2  PKGFS_MOD_BZ2:=		libbz2 -PKGFD_MOD_EXPAT:=	xml support -PKGFB_MOD_EXPAT:=	expat -PKGFS_MOD_EXPAT:=	libexpat  PKGFD_MOD_SQLITE:=	sqlite support  PKGFB_MOD_SQLITE:=	sqlite  PKGFS_MOD_SQLITE:=	libsqlite @@ -44,9 +37,9 @@ PKGFS_MOD_NCURSES:=	libncurses  PKGFD_MOD_READLINE:=	readline support  PKGFB_MOD_READLINE:=	readline  PKGFS_MOD_READLINE:=	libreadline -PKGFD_MOD_SSL:=		ssl support -PKGFB_MOD_SSL:=		libressl -PKGFS_MOD_SSL:=		libressl +PKGFD_MOD_OPENSSL:=	openssl support +PKGFB_MOD_OPENSSL:=	openssl +PKGFS_MOD_OPENSSL:=	libopenssl  DISTFILES:=		Python-${PKG_VERSION}.tar.xz  WRKDIST=		${WRKDIR}/Python-${PKG_VERSION} @@ -59,9 +52,9 @@ define PKG_mod_template  INSTALL_MODS_$${ADK_PACKAGE_${1}}+=    ${2}-install  ${2}-install: -	${INSTALL_DIR} $$(IDIR_$(1))/usr/lib/python3.8/lib-dynload +	${INSTALL_DIR} $$(IDIR_$(1))/usr/lib/python3.13/lib-dynload  	for m in ${2}; do \ -		${INSTALL_DATA} $(WRKINST)/usr/lib/python3.8/lib-dynload/$$$${m}*.so $$(IDIR_$(1))/usr/lib/python3.8/lib-dynload ;\ +		${INSTALL_DATA} $(WRKINST)/usr/lib/python3.13/lib-dynload/$$$${m}*.so $$(IDIR_$(1))/usr/lib/python3.13/lib-dynload ;\  	done  endef @@ -71,48 +64,49 @@ $(eval $(call PKG_template,PYTHON3,python3,${PKG_VERSION}-${PKG_RELEASE},${PKG_D  $(eval $(call PKG_template,PYTHON3_MOD_ZLIB,python3-mod-zlib,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_ZLIB},${PKGFD_MOD_ZLIB},${PKG_SECTION}))  $(eval $(call PKG_template,PYTHON3_MOD_BZ2,python3-mod-bz2,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_BZ2},${PKGFD_MOD_BZ2},${PKG_SECTION})) -$(eval $(call PKG_template,PYTHON3_MOD_EXPAT,python3-mod-expat,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_EXPAT},${PKGFD_MOD_EXPAT},${PKG_SECTION}))  $(eval $(call PKG_template,PYTHON3_MOD_SQLITE,python3-mod-sqlite,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_SQLITE},${PKGFD_MOD_SQLITE},${PKG_SECTION}))  $(eval $(call PKG_template,PYTHON3_MOD_GDBM,python3-mod-gdbm,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_GDBM},${PKGFD_MOD_GDBM},${PKG_SECTION}))  $(eval $(call PKG_template,PYTHON3_MOD_NCURSES,python3-mod-ncurses,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_NCURSES},${PKGFD_MOD_NCURSES},${PKG_SECTION})) -$(eval $(call PKG_template,PYTHON3_MOD_SSL,python3-mod-ssl,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_SSL},${PKGFD_MOD_SSL},${PKG_SECTION})) -#$(eval $(call PKG_template,PYTHON3_MOD_READLINE,python3-mod-readline,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_READLINE},${PKGFD_MOD_READLINE},${PKG_SECTION})) +$(eval $(call PKG_template,PYTHON3_MOD_OPENSSL,python3-mod-openssl,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_OPENSSL},${PKGFD_MOD_OPENSSL},${PKG_SECTION})) +$(eval $(call PKG_template,PYTHON3_MOD_READLINE,python3-mod-readline,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_READLINE},${PKGFD_MOD_READLINE},${PKG_SECTION}))  $(eval $(call PKG_mod_template,PYTHON3_MOD_ZLIB,zlib))  $(eval $(call PKG_mod_template,PYTHON3_MOD_BZ2,_bz2)) -$(eval $(call PKG_mod_template,PYTHON3_MOD_EXPAT,pyexpat))  $(eval $(call PKG_mod_template,PYTHON3_MOD_SQLITE,_sqlite))  $(eval $(call PKG_mod_template,PYTHON3_MOD_GDBM,_gdbm))  $(eval $(call PKG_mod_template,PYTHON3_MOD_NCURSES,_curses)) -$(eval $(call PKG_mod_template,PYTHON3_MOD_SSL,_ssl)) -#$(eval $(call PKG_mod_template,PYTHON3_MOD_READLINE,readline)) +$(eval $(call PKG_mod_template,PYTHON3_MOD_OPENSSL,_ssl)) +$(eval $(call PKG_mod_template,PYTHON3_MOD_READLINE,readline))  MAKE_ENV+=		HOSTPGEN=$(STAGING_HOST_DIR)/usr/bin/pgen3  FAKE_FLAGS+=		ENSUREPIP=no -CONFIGURE_ARGS:=	--with-threads \ -			--with-system-ffi \ -			--with-system-expat \ -			--disable-ipv6 \ -			--without-cxx-main +CONFIGURE_ARGS:=	--with-system-expat \ +			--disable-test-modules \ +			--with-build-python=$(STAGING_HOST_DIR)/usr/bin/python3  CONFIGURE_ENV+=		ac_cv_have_long_long_format=yes \ +			ac_cv_buggy_getaddrinfo=no \  			ac_cv_file__dev_ptmx=yes \ -			ac_cv_file__dev_ptc=no +			ac_cv_file__dev_ptc=no \ +			ac_cv_header_libintl_h=no -HOST_CONFIGURE_ARGS+=	--without-cxx-main \ -			--with-threads +ifeq ($(ADK_TARGET_BIG_ENDIAN),y) +CONFIGURE_ENV+=		ax_cv_c_float_words_bigendian=yes +else +CONFIGURE_ENV+=		ax_cv_c_float_words_bigendian=no +endif  python3-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}  	${INSTALL_DIR} ${IDIR_PYTHON3}/usr/bin ${IDIR_PYTHON3}/usr/lib -	${INSTALL_DIR} ${IDIR_PYTHON3}/usr/lib/python3.8 -	${INSTALL_DIR} ${IDIR_PYTHON3}/usr/include/python3.8 +	${INSTALL_DIR} ${IDIR_PYTHON3}/usr/lib/python3.13 +	${INSTALL_DIR} ${IDIR_PYTHON3}/usr/include/python3.13  	${INSTALL_BIN} ${WRKINST}/usr/bin/python3 ${IDIR_PYTHON3}/usr/bin  	${CP} ${WRKINST}/usr/lib/libpython*.so* ${IDIR_PYTHON3}/usr/lib -	${CP} ${WRKINST}/usr/lib/python3.8/* ${IDIR_PYTHON3}/usr/lib/python3.8 -	${CP} ${WRKINST}/usr/include/python3.8/pyconfig.h \ -		 ${IDIR_PYTHON3}/usr/include/python3.8 +	${CP} ${WRKINST}/usr/lib/python3.13/* ${IDIR_PYTHON3}/usr/lib/python3.13 +	${CP} ${WRKINST}/usr/include/python3.13/pyconfig.h \ +		 ${IDIR_PYTHON3}/usr/include/python3.13  	@-for i in zlib _bz2 _curses _ssl _gdbm _sqlite pyexpat readline; do \ -		rm ${IDIR_PYTHON3}/usr/lib/python3.8/lib-dynload/$${i}*so; \ +		rm ${IDIR_PYTHON3}/usr/lib/python3.13/lib-dynload/$${i}*so; \  	done  include ${ADK_TOPDIR}/mk/host-bottom.mk diff --git a/package/python3/patches/patch-setup_py b/package/python3/patches/patch-setup_py deleted file mode 100644 index 90acd7eea..000000000 --- a/package/python3/patches/patch-setup_py +++ /dev/null @@ -1,11 +0,0 @@ ---- Python-3.8.2.orig/setup.py	2020-02-24 22:36:25.000000000 +0100 -+++ Python-3.8.2/setup.py	2020-04-15 22:28:11.208150620 +0200 -@@ -654,7 +654,7 @@ class PyBuildExt(build_ext): -         # only change this for cross builds for 3.3, issues on Mageia -         if CROSS_COMPILING: -             self.add_cross_compiling_paths() --        self.add_multiarch_paths() -+#        self.add_multiarch_paths() -         self.add_ldflags_cppflags() -  -     def init_inc_lib_dirs(self): | 
