From a54e58e9b2e60935e9baac2989a00e66d0637c46 Mon Sep 17 00:00:00 2001 From: Lionel Orry Date: Thu, 11 Oct 2018 11:57:54 +0200 Subject: [PATCH] package/pkg-python: _SUBDIR cleanup No functional change is brought by this modification. This patch: * removes redundant _SRCDIR and _BUILDDIR declarations (already defined in pkg-generic.mk) * documents the usage of _SUBDIR in the python-specific section of the manual. Signed-off-by: Lionel Orry Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-python.txt | 6 ++++++ package/pkg-python.mk | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt index 5eb6ba51b1..15137cfd6d 100644 --- a/docs/manual/adding-packages-python.txt +++ b/docs/manual/adding-packages-python.txt @@ -113,6 +113,12 @@ optionally be defined, depending on the package's needs. Many of them are only useful in very specific cases, typical packages will therefore only use a few of them, or none. +* +PYTHON_FOO_SUBDIR+ may contain the name of a subdirectory inside the + package that contains the main +setup.py+ file. This is useful, + if for example, the main +setup.py+ file is not at the root of + the tree extracted by the tarball. If +HOST_PYTHON_FOO_SUBDIR+ is not + specified, it defaults to +PYTHON_FOO_SUBDIR+. + * +PYTHON_FOO_ENV+, to specify additional environment variables to pass to the Python +setup.py+ script (for both the build and install steps). Note that the infrastructure is automatically passing diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 8d40a7ca48..e906920417 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -105,9 +105,6 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ define inner-python-package -$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR) -$(2)_BUILDDIR = $$($(2)_SRCDIR) - $(2)_ENV ?= $(2)_BUILD_OPTS ?= $(2)_INSTALL_OPTS ?= -- 2.30.2