sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump Rust to 1.38.0

Browse Source 
Due to https://github.com/rust-lang/rust/issues/62558, the tools: rls,
clippy, and rustfmt cannot be built.

We also remove src which cuts the resulting size of the dep from about
330MB to 180MB.

The build is further broken into two steps:
1. `x.py dist`
2. `x.py install`

This change is because `x.py install` now fails due to an issue where
bootstrap tries to install  rustc-aarch64-linux-android before the
installation script is generated.
This commit is contained in:
Kevin Cotugno 2019-09-30 11:46:18 -07:00 committed by Leonid Pliushch
parent 3dc124bbe6
commit a26ce95158
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/rust/build.sh
View File

@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.rust-lang.org/
TERMUX_PKG_DESCRIPTION="Systems programming language focused on safety, speed and concurrency" TERMUX_PKG_DESCRIPTION="Systems programming language focused on safety, speed and concurrency"
TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="Kevin Cotugno @kcotugno" TERMUX_PKG_MAINTAINER="Kevin Cotugno @kcotugno"
TERMUX_PKG_VERSION=1.36.0 TERMUX_PKG_VERSION=1.38.0
TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/rustc-$TERMUX_PKG_VERSION-src.tar.xz TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/rustc-$TERMUX_PKG_VERSION-src.tar.xz
TERMUX_PKG_SHA256=f51645b9f787af4a5d94db17f6af39db0c55980ed24fe366cad55b57900f8f2d TERMUX_PKG_SHA256=3a7991aa4cb44ef941d71636e45a95468b520dc6fc7cf725364925bd3e3d3a34
TERMUX_PKG_DEPENDS="libc++, clang, openssl, lld, zlib" TERMUX_PKG_DEPENDS="libc++, clang, openssl, lld, zlib"
termux_step_configure() { termux_step_configure() {
@ -18,8 +18,8 @@ termux_step_configure() {
# like 30 to 40 + minutes ... so lets get it right # like 30 to 40 + minutes ... so lets get it right
# 1.36 needs 1.35 to build revert to using $TERMUX_PKG_VERSION next time.. # 1.36 needs 1.35 to build revert to using $TERMUX_PKG_VERSION next time..
rustup install 1.35.0 rustup install 1.37.0
export PATH=$HOME/.rustup/toolchains/1.35.0-x86_64-unknown-linux-gnu/bin:$PATH export PATH=$HOME/.rustup/toolchains/1.37.0-x86_64-unknown-linux-gnu/bin:$PATH
local RUSTC=$(which rustc) local RUSTC=$(which rustc)
local CARGO=$(which cargo) local CARGO=$(which cargo)
@ -44,16 +44,21 @@ termux_step_configure() {
} }
termux_step_make() { termux_step_make() {
return 0; $TERMUX_PKG_SRCDIR/x.py dist
} }
termux_step_make_install() { termux_step_make_install() {
$TERMUX_PKG_SRCDIR/x.py install \ $TERMUX_PKG_SRCDIR/x.py install
--host $CARGO_TARGET_NAME \
--target $CARGO_TARGET_NAME \
--target wasm32-unknown-unknown
cd "$TERMUX_PREFIX/lib" cd "$TERMUX_PREFIX/lib"
ln -sf rustlib/$CARGO_TARGET_NAME/lib/*.so . ln -sf rustlib/$CARGO_TARGET_NAME/lib/*.so .
ln -sf $TERMUX_PREFIX/bin/lld $TERMUX_PREFIX/bin/rust-lld ln -sf $TERMUX_PREFIX/bin/lld $TERMUX_PREFIX/bin/rust-lld
cd "$TERMUX_PREFIX/lib/rustlib"
rm -rf components \
install.log \
uninstall.sh \
rust-installer-version \
manifest-* \
x86_64-unknown-linux-gnu
} }

18
packages/rust/config.toml
View File

@ -6,37 +6,35 @@ link-shared = true
[build] [build]
host = ["@triple@"] host = ["@triple@"]
target = ["@triple@"] target = ["@triple@", "wasm32-unknown-unknown"]
rustc = "@RUSTC@" rustc = "@RUSTC@"
cargo = "@CARGO@" cargo = "@CARGO@"
python = "python2.7" python = "python2.7"
extended = true extended = true
sanitizers = false sanitizers = false
tools = ["cargo", "analysis"]
[install] [install]
prefix = "@TERMUX_PREFIX@" prefix = "@TERMUX_PREFIX@"
sysconfdir = "etc" sysconfdir = "etc"
[rust] [rust]
codegen-units = 1 optimize = true
debug = false
codegen-units = 0
jemalloc = false jemalloc = false
debuginfo = true
debuginfo-lines = true
channel = "stable" channel = "stable"
rpath = false rpath = false
[target.x86_64-unknown-linux-gnu] [target.x86_64-unknown-linux-gnu]
llvm-config = "/usr/bin/llvm-config-8" llvm-config = "/usr/bin/llvm-config-8"
[target.@triple@] [target.@triple@]
android-ndk = "@TERMUX_STANDALONE_TOOLCHAIN@" android-ndk = "@TERMUX_STANDALONE_TOOLCHAIN@"
llvm-config = "@TERMUX_PREFIX@/bin/llvm-config" llvm-config = "@TERMUX_PREFIX@/bin/llvm-config"
[dist] [dist]
src-tarball = false src-tarball = false
missing-tools = true