Re: [ptxdist] [APPLIED] python3: Version bumb to 3.11.2

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 2644955b74b7ea4944bacec3b9cfd943aec0b33b.

Michael

[sent from post-receive hook]

On Wed, 12 Apr 2023 08:29:38 +0200, Robin van der Gracht <robin@protonic.nl> wrote:
> Signed-off-by: Robin van der Gracht <robin@protonic.nl>
> Message-Id: <20230328123226.668075-2-robin@protonic.nl>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/Python-3.10.4/0001-python3-don-t-leak-host-path-into-target-binaries.patch b/patches/Python-3.10.4/0001-python3-don-t-leak-host-path-into-target-binaries.patch
> deleted file mode 100644
> index e59f7c64936a..000000000000
> --- a/patches/Python-3.10.4/0001-python3-don-t-leak-host-path-into-target-binaries.patch
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -From: Michael Olbrich <m.olbrich@pengutronix.de>
> -Date: Sun, 14 Oct 2018 18:51:17 +0200
> -Subject: [PATCH] python3: don't leak host path into target binaries
> -
> -Without this the rpath of the _dbm module contains <sysroot>/usr/lib.
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ----
> - setup.py | 1 -
> - 1 file changed, 1 deletion(-)
> -
> -diff --git a/setup.py b/setup.py
> -index bf90600eaad3..9250f5a1b691 100644
> ---- a/setup.py
> -+++ b/setup.py
> -@@ -1516,7 +1516,6 @@ class PyBuildExt(build_ext):
> -                         if dbm_setup_debug: print("building dbm using bdb")
> -                         dbmext = Extension('_dbm', ['_dbmmodule.c'],
> -                                            library_dirs=dblib_dir,
> --                                           runtime_library_dirs=dblib_dir,
> -                                            include_dirs=db_incs,
> -                                            define_macros=[
> -                                                ('HAVE_BERKDB_H', None),
> diff --git a/patches/Python-3.10.4/0002-python3-prevent-host-path-leakage.patch b/patches/Python-3.10.4/0002-python3-prevent-host-path-leakage.patch
> deleted file mode 100644
> index e4d5eed17758..000000000000
> --- a/patches/Python-3.10.4/0002-python3-prevent-host-path-leakage.patch
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -From: Bastian Stender <bst@pengutronix.de>
> -Date: Mon, 8 Jan 2018 16:11:23 +0100
> -Subject: [PATCH] python3: prevent host path leakage
> -
> -If cross-compiling and host/target architecture match host paths are
> -added to include_dirs and library_dirs in add_multiarch_paths() (e.g.
> -/usr/lib/i386-linux-gnu, /usr/include/i386-linux-gnu). This leads to
> -build failures for some extensions (at least _ssl and _socket).
> -
> -ptxdist does not support multiarch, so remove this addition when
> -cross-compiling.
> -
> -Based on a patch by Alexandru Ardelean <ardeleanalex@gmail.com>.
> -
> -See these patches for reference:
> -- https://github.com/openwrt/packages/pull/784
> -- https://github.com/openwrt/packages/blob/master/lang/python/python/patches/006-remove-multi-arch-and-local-paths.patch
> -- http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-devtools/python/python/host_include_contamination.patch
> -
> -Signed-off-by: Bastian Stender <bst@pengutronix.de>
> ----
> - setup.py | 4 +++-
> - 1 file changed, 3 insertions(+), 1 deletion(-)
> -
> -diff --git a/setup.py b/setup.py
> -index 9250f5a1b691..3278aaf6e677 100644
> ---- a/setup.py
> -+++ b/setup.py
> -@@ -829,10 +829,12 @@ class PyBuildExt(build_ext):
> -         if not CROSS_COMPILING:
> -             add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
> -             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
> -+
> -+            self.add_multiarch_paths()
> -+
> -         # 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_ldflags_cppflags()
> - 
> -     def init_inc_lib_dirs(self):
> -
> diff --git a/patches/Python-3.10.4/series b/patches/Python-3.10.4/series
> deleted file mode 100644
> index 305ae1d73d43..000000000000
> --- a/patches/Python-3.10.4/series
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-python3-don-t-leak-host-path-into-target-binaries.patch
> -0002-python3-prevent-host-path-leakage.patch
> -# 9a6f885c0db25c8cff5dd088d9eff6af  - git-ptx-patches magic
> diff --git a/rules/python3.make b/rules/python3.make
> index b8cffc1906db..d3f872206c30 100644
> --- a/rules/python3.make
> +++ b/rules/python3.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_PYTHON3) += python3
>  #
>  # Paths and names
>  #
> -PYTHON3_VERSION		:= 3.10.4
> -PYTHON3_MD5		:= 21f2e113e087083a1e8cf10553d93599
> +PYTHON3_VERSION		:= 3.11.2
> +PYTHON3_MD5		:= a957cffb58a89303b62124896881950b
>  PYTHON3_MAJORMINOR	:= $(basename $(PYTHON3_VERSION))
>  PYTHON3_SITEPACKAGES	:= /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages
>  PYTHON3			:= Python-$(PYTHON3_VERSION)
> @@ -76,7 +76,8 @@ PYTHON3_CONF_OPT	:= \
>  	--without-dtrace \
>  	--with-computed-gotos \
>  	--without-ensurepip \
> -	--with-openssl=$(SYSROOT)/usr
> +	--with-openssl=$(SYSROOT)/usr \
> +	--with-build-python=python$(PYTHON3_MAJORMINOR)
>  
>  # Keep dictionary order in .pyc files stable
>  PYTHON3_MAKE_ENV := \