Skip to contentSkip to conversation

package: drop <pkg>_NEEDS_HOST_PYTHON

PATCH In review Peter Korsgaard 1 participant 4 messages Feb 12, 2022 – Feb 13, 2022 Arm/Amlogic Meson SoC support

lore
Share & tools
lore

Peter Korsgaard

author
#0 lore raw

PATCH 1/2 package: drop <pkg>_NEEDS_HOST_PYTHON

Now that host-python2 is gone and the corresponding logic in pkg-python.

Signed-off-by Peter Korsgaard <[email protected]>
---
 package/meson/meson.mk                                          | 1 -
 package/python-charset-normalizer/python-charset-normalizer.mk  | 1 -
 package/python-decorator/python-decorator.mk                    | 1 -
 package/python-idna/python-idna.mk                              | 1 -
 package/python-inflection/python-inflection.mk                  | 1 -
 package/python-installer/python-installer.mk                    | 1 -
 package/python-jinja2/python-jinja2.mk                          | 2 --
 package/python-mako/python-mako.mk                              | 2 --
 package/python-markupsafe/python-markupsafe.mk                  | 2 --
 package/python-networkx/python-networkx.mk                      | 1 -
 package/python-packaging/python-packaging.mk                    | 1 -
 package/python-pep517/python-pep517.mk                          | 1 -
 package/python-pypa-build/python-pypa-build.mk                  | 1 -
 package/python-pyparsing/python-pyparsing.mk                    | 1 -
 package/python-pyyaml/python-pyyaml.mk                          | 1 -
 package/python-requests/python-requests.mk                      | 1 -
 package/python-setuptools-rust/python-setuptools-rust.mk        | 1 -
 .../python-setuptools-scm-git-archive.mk                        | 1 -
 package/python-setuptools-scm/python-setuptools-scm.mk          | 1 -
 package/python-tomli/python-tomli.mk                            | 1 -
 package/python-typing-extensions/python-typing-extensions.mk    | 1 -
 package/python-urllib3/python-urllib3.mk                        | 1 -
 package/scons/scons.mk                                          | 2 --
 package/setools/setools.mk                                      | 1 -
 24 files changed, 28 deletions(-)
package/meson/meson.mk +0 -1
index ad15e3f91e..125488dd46 100644
@@ -11,7 +11,6 @@ MESON_LICENSE_FILES = COPYING
 MESON_SETUP_TYPE = setuptools
 
 HOST_MESON_DEPENDENCIES = host-ninja
-HOST_MESON_NEEDS_HOST_PYTHON = python3
 
 # Avoid interpreter shebang longer than 128 chars
 define HOST_MESON_SET_INTERPRETER
package/python-charset-normalizer/python-charset-normalizer.mk +0 -1
index 0a96a6b078..c37b068b36 100644
@@ -10,7 +10,6 @@ PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/e8/e8/b
 PYTHON_CHARSET_NORMALIZER_SETUP_TYPE = setuptools
 PYTHON_CHARSET_NORMALIZER_LICENSE = MIT
 PYTHON_CHARSET_NORMALIZER_LICENSE_FILES = LICENSE
-HOST_PYTHON_CHARSET_NORMALIZER_NEEDS_HOST_PYTHON = python3
 
 $(eval $(python-package))
 $(eval $(host-python-package))
package/python-decorator/python-decorator.mk +0 -1
index a7e338bdc0..a61f045e2a 100644
@@ -12,7 +12,6 @@ PYTHON_DECORATOR_LICENSE_FILES = LICENSE.txt
 PYTHON_DECORATOR_CPE_ID_VENDOR = python
 PYTHON_DECORATOR_CPE_ID_PRODUCT = decorator
 PYTHON_DECORATOR_SETUP_TYPE = setuptools
-HOST_PYTHON_DECORATOR_NEEDS_HOST_PYTHON = python3
 
 $(eval $(python-package))
 $(eval $(host-python-package))
package/python-idna/python-idna.mk +0 -1
index 2a1ec8314b..6f416156d0 100644
@@ -10,7 +10,6 @@ PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/62/08/e3fc7c8161090f7
 PYTHON_IDNA_LICENSE = BSD-3-Clause
 PYTHON_IDNA_LICENSE_FILES = LICENSE.md
 PYTHON_IDNA_SETUP_TYPE = setuptools
-HOST_PYTHON_IDNA_NEEDS_HOST_PYTHON = python3
 
 $(eval $(python-package))
 $(eval $(host-python-package))
package/python-inflection/python-inflection.mk +0 -1
index 59f35aa135..7c030e99b9 100644
@@ -10,7 +10,6 @@ PYTHON_INFLECTION_SITE = https://files.pythonhosted.org/packages/e1/7e/691d061b7
 PYTHON_INFLECTION_SETUP_TYPE = setuptools
 PYTHON_INFLECTION_LICENSE = MIT
 PYTHON_INFLECTION_LICENSE_FILES = LICENSE
-HOST_PYTHON_INFLECTION_NEEDS_HOST_PYTHON = python3
 
 $(eval $(python-package))
 $(eval $(host-python-package))
package/python-installer/python-installer.mk +0 -1
index 2c1d371dab..82739a8003 100644
@@ -10,6 +10,5 @@ PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/71/9a/8d7c724b0d
 PYTHON_INSTALLER_LICENSE = MIT
 PYTHON_INSTALLER_LICENSE_FILES = LICENSE
 PYTHON_INSTALLER_SETUP_TYPE = distutils
-HOST_PYTHON_INSTALLER_NEEDS_HOST_PYTHON = python3
 
 $(eval $(host-python-package))
package/python-jinja2/python-jinja2.mk +0 -2
index 752daf653c..0503984bef 100644
@@ -17,7 +17,5 @@ PYTHON_JINJA2_CPE_ID_PRODUCT = jinja2
 PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe
 HOST_PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe
 
-HOST_PYTHON_JINJA2_NEEDS_HOST_PYTHON = python3
-
 $(eval $(python-package))
 $(eval $(host-python-package))
package/python-mako/python-mako.mk +0 -2
index 26fe95c606..553c4a5339 100644
@@ -11,8 +11,6 @@ PYTHON_MAKO_SETUP_TYPE = setuptools
 PYTHON_MAKO_LICENSE = MIT
 PYTHON_MAKO_LICENSE_FILES = LICENSE
 
-HOST_PYTHON_MAKO_NEEDS_HOST_PYTHON = python3
-
 # In host build, setup.py tries to download markupsafe if it is not installed
 HOST_PYTHON_MAKO_DEPENDENCIES = host-python-markupsafe
package/python-markupsafe/python-markupsafe.mk +0 -2
index 14a8d06dfe..e0e689f5a1 100644
@@ -11,7 +11,5 @@ PYTHON_MARKUPSAFE_SETUP_TYPE = setuptools
 PYTHON_MARKUPSAFE_LICENSE = BSD-3-Clause
 PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE.rst
 
-HOST_PYTHON_MARKUPSAFE_NEEDS_HOST_PYTHON = python3
-
 $(eval $(python-package))
 $(eval $(host-python-package))
package/python-networkx/python-networkx.mk +0 -1
index 3b05011eb9..1908ed8f93 100644
@@ -13,7 +13,6 @@ PYTHON_NETWORKX_CPE_ID_VENDOR = python
 PYTHON_NETWORKX_CPE_ID_PRODUCT = networkx
 PYTHON_NETWORKX_SETUP_TYPE = setuptools
 HOST_PYTHON_NETWORKX_DEPENDENCIES = host-python-decorator
-HOST_PYTHON_NETWORKX_NEEDS_HOST_PYTHON = python3
 
 $(eval $(python-package))
 $(eval $(host-python-package))
package/python-packaging/python-packaging.mk +0 -1
index 569dc0bf58..74b5803525 100644
@@ -10,7 +10,6 @@ PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/9e/d1a7217f69
 PYTHON_PACKAGING_SETUP_TYPE = setuptools
 PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause
 PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD
-HOST_PYTHON_PACKAGING_NEEDS_HOST_PYTHON = python3
 HOST_PYTHON_PACKAGING_DEPENDENCIES = host-python-pyparsing
 
 $(eval $(python-package))
package/python-pep517/python-pep517.mk +0 -1
index da0431a637..99aa62d51d 100644
@@ -10,7 +10,6 @@ PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c6791
 PYTHON_PEP517_LICENSE = MIT
 PYTHON_PEP517_LICENSE_FILES = LICENSE
 PYTHON_PEP517_SETUP_TYPE = distutils
-HOST_PYTHON_PEP517_NEEDS_HOST_PYTHON = python3
 HOST_PYTHON_PEP517_DEPENDENCIES = host-python-tomli
 
 $(eval $(host-python-package))
package/python-pypa-build/python-pypa-build.mk +0 -1
index 6babade672..dc8363f59e 100644
@@ -10,7 +10,6 @@ PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/f0/62/c73b77521
 PYTHON_PYPA_BUILD_LICENSE = MIT
 PYTHON_PYPA_BUILD_LICENSE_FILES = LICENSE
 PYTHON_PYPA_BUILD_SETUP_TYPE = setuptools
-HOST_PYTHON_PYPA_BUILD_NEEDS_HOST_PYTHON = python3
 HOST_PYTHON_PYPA_BUILD_DEPENDENCIES = \
 	host-python-packaging \
 	host-python-pep517 \
package/python-pyparsing/python-pyparsing.mk +0 -1
index e33541bdb7..2fb705bc7a 100644
@@ -10,7 +10,6 @@ PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/d6/60/9bed18f432
 PYTHON_PYPARSING_LICENSE = MIT
 PYTHON_PYPARSING_LICENSE_FILES = LICENSE
 PYTHON_PYPARSING_SETUP_TYPE = setuptools
-HOST_PYTHON_PYPARSING_NEEDS_HOST_PYTHON = python3
 
 $(eval $(python-package))
 $(eval $(host-python-package))
package/python-pyyaml/python-pyyaml.mk +0 -1
index 8f5a2d269e..067af8ea7d 100644
@@ -15,7 +15,6 @@ PYTHON_PYYAML_CPE_ID_PRODUCT = pyyaml
 PYTHON_PYYAML_DEPENDENCIES = host-python-cython libyaml
 PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1
 HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml
-HOST_PYTHON_PYYAML_NEEDS_HOST_PYTHON = python3
 
 $(eval $(python-package))
 $(eval $(host-python-package))
package/python-requests/python-requests.mk +0 -1
index 962646516e..9613a2c47c 100644
@@ -12,7 +12,6 @@ PYTHON_REQUESTS_LICENSE = Apache-2.0
 PYTHON_REQUESTS_LICENSE_FILES = LICENSE
 PYTHON_REQUESTS_CPE_ID_VENDOR = python
 PYTHON_REQUESTS_CPE_ID_PRODUCT = requests
-HOST_PYTHON_REQUESTS_NEEDS_HOST_PYTHON = python3
 HOST_PYTHON_REQUESTS_DEPENDENCIES = \
 	host-python-certifi \
 	host-python-charset-normalizer \
package/python-setuptools-rust/python-setuptools-rust.mk +0 -1
index c87a0da3c7..394789b056 100644
@@ -11,6 +11,5 @@ PYTHON_SETUPTOOLS_RUST_SETUP_TYPE = setuptools
 PYTHON_SETUPTOOLS_RUST_LICENSE = MIT
 PYTHON_SETUPTOOLS_RUST_LICENSE_FILES = LICENSE
 HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = host-rustc host-python-setuptools-scm host-python-toml host-python-semantic-version host-python-typing-extensions
-HOST_PYTHON_SETUPTOOLS_RUST_NEEDS_HOST_PYTHON = python3
 
 $(eval $(host-python-package))
package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk +0 -1
index 48ca9c89ae..032e2d3fc9 100644
@@ -11,6 +11,5 @@ PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools
 PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT
 PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE
 HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_DEPENDENCIES = host-python-setuptools-scm
-HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_NEEDS_HOST_PYTHON = python3
 
 $(eval $(host-python-package))
package/python-setuptools-scm/python-setuptools-scm.mk +0 -1
index 8c5229e1a6..132eb398aa 100644
@@ -11,6 +11,5 @@ PYTHON_SETUPTOOLS_SCM_LICENSE = MIT
 PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE
 PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools
 HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = host-python-packaging host-python-tomli
-HOST_PYTHON_SETUPTOOLS_SCM_NEEDS_HOST_PYTHON = python3
 
 $(eval $(host-python-package))
package/python-tomli/python-tomli.mk +0 -1
index 4e6b023ef7..b8c20ca736 100644
@@ -10,7 +10,6 @@ PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61ae
 PYTHON_TOMLI_SETUP_TYPE = distutils
 PYTHON_TOMLI_LICENSE = MIT
 PYTHON_TOMLI_LICENSE_FILES = LICENSE
-HOST_PYTHON_TOMLI_NEEDS_HOST_PYTHON = python3
 
 $(eval $(python-package))
 $(eval $(host-python-package))
package/python-typing-extensions/python-typing-extensions.mk +0 -1
index 407fe99b54..668071e025 100644
@@ -10,7 +10,6 @@ PYTHON_TYPING_EXTENSIONS_SITE = https://files.pythonhosted.org/packages/ed/12/c5
 PYTHON_TYPING_EXTENSIONS_SETUP_TYPE = setuptools
 PYTHON_TYPING_EXTENSIONS_LICENSE = Python-2.0
 PYTHON_TYPING_EXTENSIONS_LICENSE_FILES = LICENSE
-HOST_PYTHON_TYPING_EXTENSIONS_NEEDS_HOST_PYTHON = python3
 
 $(eval $(python-package))
 $(eval $(host-python-package))
package/python-urllib3/python-urllib3.mk +0 -1
index c9c8a912d1..d94c97b4ed 100644
@@ -12,7 +12,6 @@ PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt
 PYTHON_URLLIB3_CPE_ID_VENDOR = python
 PYTHON_URLLIB3_CPE_ID_PRODUCT = urllib3
 PYTHON_URLLIB3_SETUP_TYPE = setuptools
-HOST_PYTHON_URLLIB3_NEEDS_HOST_PYTHON = python3
 
 $(eval $(python-package))
 $(eval $(host-python-package))
package/scons/scons.mk +0 -2
index bc5d2a1ef9..6b75d3ddca 100644
@@ -10,8 +10,6 @@ SCONS_LICENSE = MIT
 SCONS_LICENSE_FILES = LICENSE.txt
 SCONS_SETUP_TYPE = distutils
 
-HOST_SCONS_NEEDS_HOST_PYTHON = python3
-
 HOST_SCONS_INSTALL_OPTS = \
 	--install-lib=$(HOST_DIR)/lib/scons-$(SCONS_VERSION)
package/setools/setools.mk +0 -1
index 5b4b4e30d8..ea355f10c8 100644
@@ -13,7 +13,6 @@ SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL
 SETOOLS_CPE_ID_VENDOR = selinuxproject
 SETOOLS_SETUP_TYPE = setuptools
 HOST_SETOOLS_DEPENDENCIES = host-python-cython host-libselinux host-libsepol host-python-networkx
-HOST_SETOOLS_NEEDS_HOST_PYTHON = python3
 
 define SETOOLS_FIX_SETUP
 	# By default, setup.py will look for libsepol.a in the host machines
Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#1 lore raw

PATCH 2/2 docs/manual/adding-packages-python.txt: drop <pkg>_NEEDS_HOST_PYTHON

Now that host-python2 is gone and the corresponding logic in pkg-python.

Signed-off-by Peter Korsgaard <[email protected]>
---
 docs/manual/adding-packages-python.txt | 7 -------
 1 file changed, 7 deletions(-)
docs/manual/adding-packages-python.txt +0 -7
index cfd2f88920..0141fea85b 100644
@@ -141,13 +141,6 @@ therefore only use a few of them, or none.
   packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host
   setuptools packages).
 
-* +HOST_PYTHON_FOO_NEEDS_HOST_PYTHON+, to define the host python
-  interpreter. The usage of this variable is limited to host
-  packages. The two supported value are +python2+ and +python3+. It
-  will ensure the right host python package is available and will
-  invoke it for the build. If some build steps are overloaded, the
-  right python interpreter must be explicitly called in the commands.
-
 With the Python infrastructure, all the steps required to build and
 install the packages are already defined, and they generally work well
 for most Python-based packages. However, when required, it is still
Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#2 lore raw

Re: [Buildroot] [PATCH 2/2] docs/manual/adding-packages-python.txt: drop <pkg>_NEEDS_HOST_PYTHON

Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

Now that host-python2 is gone and the corresponding logic in pkg-python.

Signed-off-by Peter Korsgaard <[email protected]>

Committed, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#3 lore raw
In reply to Peter Korsgaard
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

Now that host-python2 is gone and the corresponding logic in pkg-python.

Signed-off-by Peter Korsgaard <[email protected]>

Committed, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot