deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

package/rust: allow using python3 interpreter

Browse source 
Fedora packaging use python3 as python interpreter since rust 1.24.0 [1]
by removing python2 tests from configure script [2].

Using python3 will help to remove python2 in a near future.

[1] 216b2d2771
[2] 216b2d2771/f/rust.spec (_314)

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Titouan Christophe <titouan.christophe@railnova.eu>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Patrick Havelange <patrick.havelange@essensium.com>
Tested-by: Titouan Christophe <titouan.christophe@railnova.eu>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Romain Naour 2020-05-26 20:20:37 +02:00 committed by Thomas Petazzoni
parent 9789f56ee3
commit 02703108ec
2 changed files with 49 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
package/rust/0002-configure-use-default-python-interpreter.patch Normal file
View file

@ -0,0 +1,37 @@
From aca7abb537f5caf1c9f027cf65dd0f53fb664e73 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Tue, 26 May 2020 18:24:25 +0200
Subject: [PATCH] configure: use default python interpreter
Don't try to use python2 if available, use the python interpreter available
in ouput/host/bin/python whatever the python version is.
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
configure | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/configure b/configure
index eeb8d081d34..6014a982f47 100755
--- a/configure
+++ b/configure
@@ -2,16 +2,4 @@
script="$(dirname $0)"/src/bootstrap/configure.py
-try() {
- cmd=$1
- shift
- T=$($cmd --version 2>/dev/null)
- if [ $? -eq 0 ]; then
- exec $cmd "$script" "$@"
- fi
-}
-
-try python2.7 "$@"
-try python27 "$@"
-try python2 "$@"
exec python $script "$@"
--
2.25.4

17
package/rust/rust.mk
View file

@ -17,9 +17,16 @@ HOST_RUST_DEPENDENCIES = \
host-rust-bin \
host-cargo-bin \
host-openssl \
host-python \
$(BR2_CMAKE_HOST_DEPENDENCY)
ifeq ($(BR2_PACKAGE_PYTHON3),y)
HOST_RUST_PYTHON_VERSION = $(PYTHON3_VERSION_MAJOR)
HOST_RUST_DEPENDENCIES += host-python3
else
HOST_RUST_PYTHON_VERSION = $(PYTHON_VERSION_MAJOR)
HOST_RUST_DEPENDENCIES += host-python
endif
HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0)
# Some vendor crates contain Cargo.toml.orig files. The associated
@ -44,7 +51,7 @@ define HOST_RUST_CONFIGURE_CMDS
echo 'target = ["$(RUSTC_TARGET_NAME)"]'; \
echo 'cargo = "$(HOST_CARGO_BIN_DIR)/cargo/bin/cargo"'; \
echo 'rustc = "$(HOST_RUST_BIN_DIR)/rustc/bin/rustc"'; \
echo 'python = "$(HOST_DIR)/bin/python2"'; \
echo 'python = "$(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION)"'; \
echo 'submodules = false'; \
echo 'vendor = true'; \
echo 'compiler-docs = false'; \
@ -61,12 +68,12 @@ define HOST_RUST_CONFIGURE_CMDS
endef
define HOST_RUST_BUILD_CMDS
cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py build
cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py build
endef
define HOST_RUST_INSTALL_CMDS
cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py dist
cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py install
cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py dist
cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py install
endef
$(eval $(host-generic-package))