parent
e0b8e640e2
commit
1f4734f25d
2 changed files with 18 additions and 16 deletions
|
@ -43,12 +43,13 @@
|
||||||
// Cygwin. The Cygwin build does not have generators for Visual
|
// Cygwin. The Cygwin build does not have generators for Visual
|
||||||
--- a/src/liblibc/src/unix/mod.rs
|
--- a/src/liblibc/src/unix/mod.rs
|
||||||
+++ b/src/liblibc/src/unix/mod.rs
|
+++ b/src/liblibc/src/unix/mod.rs
|
||||||
@@ -197,9 +197,6 @@
|
@@ -209,10 +209,6 @@
|
||||||
} else if #[cfg(all(not(stdbuild), feature = "use_std"))] {
|
} else if #[cfg(all(not(stdbuild), feature = "use_std"))] {
|
||||||
// cargo build, don't pull in anything extra as the libstd dep
|
// cargo build, don't pull in anything extra as the libstd dep
|
||||||
// already pulls in all libs.
|
// already pulls in all libs.
|
||||||
- } else if #[cfg(any(all(target_env = "musl", not(target_arch = "mips"))))] {
|
- } else if #[cfg(any(all(target_env = "musl", not(target_arch = "mips"))))] {
|
||||||
- #[link(name = "c", kind = "static")]
|
- #[link(name = "c", kind = "static", cfg(target_feature = "crt-static"))]
|
||||||
|
- #[link(name = "c", cfg(not(target_feature = "crt-static")))]
|
||||||
- extern {}
|
- extern {}
|
||||||
} else if #[cfg(target_os = "emscripten")] {
|
} else if #[cfg(target_os = "emscripten")] {
|
||||||
#[link(name = "c")]
|
#[link(name = "c")]
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
# Template file for 'rust'
|
# Template file for 'rust'
|
||||||
pkgname=rust
|
pkgname=rust
|
||||||
version=1.14.0
|
version=1.15.0
|
||||||
revision=1
|
revision=1
|
||||||
# NB. if you push any(!) new version, don't forget to put a build
|
# NB. if you push any(!) new version, don't forget to put a build
|
||||||
# output of musl to https://repo.voidlinux.eu/distfiles/
|
# output of musl to https://repo.voidlinux.eu/distfiles/
|
||||||
wrksrc="rustc-${version}"
|
wrksrc="rustc-${version}-src"
|
||||||
lib32disabled=yes
|
lib32disabled=yes
|
||||||
patch_args="-Np1"
|
patch_args="-Np1"
|
||||||
build_style=configure
|
build_style=configure
|
||||||
|
@ -13,33 +13,33 @@ only_for_archs="x86_64 x86_64-musl"
|
||||||
hostmakedepends="cmake curl pkg-config python"
|
hostmakedepends="cmake curl pkg-config python"
|
||||||
makedepends="libffi-devel lld-devel llvm ncurses-devel zlib-devel"
|
makedepends="libffi-devel lld-devel llvm ncurses-devel zlib-devel"
|
||||||
short_desc="Safe, concurrent, practical systems language"
|
short_desc="Safe, concurrent, practical systems language"
|
||||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
maintainer="Leah Neukirchen <leah@vuxu.org>"
|
||||||
homepage="http://www.rust-lang.org/"
|
homepage="http://www.rust-lang.org/"
|
||||||
license="MIT, Apache-2.0"
|
license="MIT, Apache-2.0"
|
||||||
distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
|
distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
|
||||||
checksum=c790edd2e915bd01bea46122af2942108479a2fda9a6f76d1094add520ac3b6b
|
checksum=33f3747d231ede34b56c6cc0ae6be8cbaa29d2fdb39d86f25693dceb9fc5f164
|
||||||
|
|
||||||
case "$XBPS_MACHINE" in
|
case "$XBPS_MACHINE" in
|
||||||
x86_64-musl)
|
x86_64-musl)
|
||||||
distfiles+="
|
distfiles+="
|
||||||
https://repo.voidlinux.eu/distfiles/rustc-1.13.0-x86_64-unknown-linux-musl.tar.gz
|
https://repo.voidlinux.eu/distfiles/rustc-1.14.0-x86_64-unknown-linux-musl.tar.gz
|
||||||
https://repo.voidlinux.eu/distfiles/rust-std-1.13.0-x86_64-unknown-linux-musl.tar.gz
|
https://repo.voidlinux.eu/distfiles/rust-std-1.14.0-x86_64-unknown-linux-musl.tar.gz
|
||||||
https://alpine.geeknet.cz/distfiles/cargo-0.11.0-nightly-x86_64-alpine-linux-musl.tar.gz"
|
https://alpine.geeknet.cz/distfiles/cargo-0.11.0-nightly-x86_64-alpine-linux-musl.tar.gz"
|
||||||
checksum+="
|
checksum+="
|
||||||
40e86108823d541c823f898962ae62580ee6209d7f08699f50a9f14810f997e8
|
0976d4d64a4b6c61d0706239880ec8c35cb4a3c46919474019c2e1d51900222b
|
||||||
ed28dd3cdea193fe05d7e1aa72e6f6e04210f0c7e93dcfdbe157d385a545eb3c
|
51147baa27f5eef372fe946f695df3f269ede92559ac3e519a794397c0fff347
|
||||||
587172026c0565e839d96b0c1d4c68c000927817398241f96682dca47fa8c3b9"
|
587172026c0565e839d96b0c1d4c68c000927817398241f96682dca47fa8c3b9"
|
||||||
;;
|
;;
|
||||||
x86_64)
|
x86_64)
|
||||||
# extract from src/stage0.txt
|
# extract from src/stage0.txt
|
||||||
distfiles+="
|
distfiles+="
|
||||||
https://static.rust-lang.org/dist/2016-11-08/rustc-1.13.0-x86_64-unknown-linux-gnu.tar.gz
|
https://static.rust-lang.org/dist/2016-12-18/rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz
|
||||||
https://static.rust-lang.org/dist/2016-11-08/rust-std-1.13.0-x86_64-unknown-linux-gnu.tar.gz
|
https://static.rust-lang.org/dist/2016-12-18/rust-std-1.14.0-x86_64-unknown-linux-gnu.tar.gz
|
||||||
https://static.rust-lang.org/cargo-dist/2016-11-02/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz"
|
https://static.rust-lang.org/cargo-dist/2016-11-28/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz"
|
||||||
checksum+="
|
checksum+="
|
||||||
0b092ba6750be89aad32b231ad9c625a11b040fae3cad5aa3ef32aaf213332d4
|
3df0ba1f65366e9220788b13ff0b91a2c3e46bfde196d54b233038157d040a9e
|
||||||
de1c616c5ac955f92e4fa4e50ed0485771726d97c7106875a931a8d3c3ed6a09
|
08f8cde5c305ba22052871292336d63cb493cbf38bb050ab0b8496a3536cac1c
|
||||||
66b4161efce4d207dfa11809776488b66cc4214b96dc155e8b8f0029fb78793c"
|
8ecf9bca3ece59ee291afda5fd8c371739d0d52771912c5da0d909fd9d130b3f"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
@ -77,6 +77,7 @@ EOF
|
||||||
|
|
||||||
pre_build() {
|
pre_build() {
|
||||||
export CARGO_HOME="$wrksrc/.cargo"
|
export CARGO_HOME="$wrksrc/.cargo"
|
||||||
|
export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
|
||||||
export LD_LIBRARY_PATH="$wrksrc/stage0/lib"
|
export LD_LIBRARY_PATH="$wrksrc/stage0/lib"
|
||||||
export PATH="$wrksrc/stage0/bin:$PATH"
|
export PATH="$wrksrc/stage0/bin:$PATH"
|
||||||
export MUSL_ROOT=/usr
|
export MUSL_ROOT=/usr
|
||||||
|
|
Loading…
Reference in a new issue