From: Adam Duskett <aduskett@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 3/8] python-setuptools: check host-python version
Date: Tue, 2 Jan 2018 10:28:02 -0500 [thread overview]
Message-ID: <20180102152807.31470-4-aduskett@gmail.com> (raw)
In-Reply-To: <20180102152807.31470-1-aduskett@gmail.com>
python-setuptools is compatible with both python2 and python3, as such,
there is no need to force python2 as a dependency.
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/python-setuptools/python-setuptools.mk | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk
index 28d4f29b5b..a21494a288 100644
--- a/package/python-setuptools/python-setuptools.mk
+++ b/package/python-setuptools/python-setuptools.mk
@@ -10,10 +10,18 @@ PYTHON_SETUPTOOLS_LICENSE = MIT
PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE
PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools
+ifeq ($(BR2_PACKAGE_HOST_PYTHON3),y)
+HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON += python3
+HOST_PYTHON_SETUPTOOLS_PYLIBVER = python$(PYTHON3_VERSION_MAJOR)
+else
+HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON += python
+HOST_PYTHON_SETUPTOOLS_PYLIBVER = python$(PYTHON_VERSION_MAJOR)
+endif
+
# recent setuptools versions require bootstrap.py to be invoked
# before the standard setup process.
define PYTHON_SETUPTOOLS_RUN_BOOTSTRAP
- cd $(@D) && $(HOST_DIR)/bin/python ./bootstrap.py
+ cd $(@D) && $(HOST_DIR)/bin/$(HOST_PYTHON_SETUPTOOLS_PYLIBVER) ./bootstrap.py
endef
PYTHON_SETUPTOOLS_PRE_CONFIGURE_HOOKS = PYTHON_SETUPTOOLS_RUN_BOOTSTRAP
--
2.14.3
next prev parent reply other threads:[~2018-01-02 15:28 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-02 15:27 [Buildroot] [PATCH 0/8] python: clean up host version logic Adam Duskett
2018-01-02 15:28 ` [Buildroot] [PATCH 1/8] python: add selectable host entry Adam Duskett
2018-01-02 15:28 ` [Buildroot] [PATCH 2/8] python3: " Adam Duskett
2018-01-02 15:28 ` Adam Duskett [this message]
2018-01-02 15:28 ` [Buildroot] [PATCH 4/8] pkg-waf.mk: check host-python version Adam Duskett
2018-01-02 22:27 ` Trent Piepho
2018-01-02 15:28 ` [Buildroot] [PATCH 5/8] ninja: " Adam Duskett
2018-01-02 15:28 ` [Buildroot] [PATCH 6/8] libselinux: " Adam Duskett
2018-01-02 15:28 ` [Buildroot] [PATCH 7/8] setools: " Adam Duskett
2018-01-02 15:28 ` [Buildroot] [PATCH 8/8] libselinux: " Adam Duskett
-- strict thread matches above, loose matches on Subject: below --
2018-01-02 16:33 [Buildroot] [PATCH 0/8] python: clean up host version logic Adam Duskett
2018-01-02 16:33 ` [Buildroot] [PATCH 3/8] python-setuptools: check host-python version Adam Duskett
2018-01-02 20:44 ` Thomas Petazzoni
2018-01-02 22:13 ` Trent Piepho
2018-01-05 20:29 ` Thomas Petazzoni
2018-01-09 1:47 ` Trent Piepho
2018-01-09 7:59 ` Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180102152807.31470-4-aduskett@gmail.com \
--to=aduskett@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox