user/rust: Bump to 1.33.0

1 files changed, 36 insertions, 58 deletions

diff --git a/user/rust/APKBUILD b/user/rust/APKBUILD
index 8534e1112..9a37b97c3 100644
--- a/user/rust/APKBUILD
+++ b/user/rust/APKBUILD
@@ -3,10 +3,10 @@
 # Contributor: Jeizsm <jeizsm@gmail.com>
 # Maintainer: Samuel Holland <samuel@sholland.org>
 pkgname=rust
-pkgver=1.31.1
-_bootcargover=0.31.0
-_bootver=1.30.1
-_llvmver=6
+pkgver=1.33.0
+_bootcargover=0.33.0
+_bootver=1.32.0
+_llvmver=7
 pkgrel=0
 pkgdesc="The Rust Programming Language"
 url="https://www.rust-lang.org"
@@ -50,25 +50,15 @@ source="https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.xz
 	0004-Require-static-native-libraries-when-linking-static-.patch
 	0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
 	0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
-	0007-Add-powerpc-unknown-linux-musl-target.patch
-	0008-Fix-powerpc64-ELFv2-big-endian-struct-passing-ABI.patch
-	0009-Use-the-ELFv2-ABI-on-powerpc64-musl.patch
-	0010-Add-powerpc64-unknown-linux-musl-target.patch
-	0011-rustc_data_structures-use-libc-types-constants-in-fl.patch
-	0012-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
-	0013-Fix-double_check-tests-on-big-endian-targets.patch
-	0014-test-invalid_const_promotion-Accept-SIGTRAP-as-a-val.patch
-	0015-test-linkage-visibility-Ensure-symbols-are-visible-t.patch
-	0016-x.py-Use-python3-instead-of-python.patch
-	0017-test-target-feature-gate-Only-run-on-relevant-target.patch
-	0018-test-use-extern-for-plugins-Don-t-assume-multilib.patch
-	0019-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
-	0020-Ignore-broken-and-non-applicable-tests.patch
-	0021-Link-stage-2-tools-dynamically-to-libstd.patch
-	0022-Move-debugger-scripts-to-usr-share-rust.patch
-	0023-Add-foxkit-target-specs.patch
-	0030-liblibc-linkage.patch
-	0031-liblibc-1b130d4c349d.patch
+	0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
+	0008-test-enum-debug-Correct-minimum-LLVM-version.patch
+	0009-test-use-extern-for-plugins-Don-t-assume-multilib.patch
+	0010-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
+	0011-Ignore-broken-and-non-applicable-tests.patch
+	0012-Link-stage-2-tools-dynamically-to-libstd.patch
+	0013-Move-debugger-scripts-to-usr-share-rust.patch
+	0014-Add-foxkit-target-specs.patch
+	0030-libc-linkage.patch
 	0040-rls-atomics.patch
 	"
 builddir="$srcdir/rustc-$pkgver-src"
@@ -117,10 +107,10 @@ build() {
 		debuginfo-lines = true
 		debuginfo-only-std = true
 		debuginfo-tools = true
-		use-jemalloc = false
 		backtrace = true
 		channel = "stable"
 		rpath = false
+		jemalloc = false
 		[target.$CTARGET]
 		cc = "$CTARGET-gcc"
 		cxx = "$CTARGET-g++"
@@ -132,20 +122,18 @@ build() {
 	LIBGIT2_SYS_USE_PKG_CONFIG=1 \
 	LLVM_LINK_SHARED=1 \
 	RUST_BACKTRACE=1 \
-	./x.py build -j ${JOBS:-2}
+	python3 x.py build -j ${JOBS:-2}
 }
 
 check() {
 	cd "$builddir"
 
 	RUST_BACKTRACE=1 \
-	./x.py test -j ${JOBS:-2} --no-doc --no-fail-fast \
+	python3 x.py test -j ${JOBS:-2} --no-doc --no-fail-fast \
 		src/test/codegen \
 		src/test/codegen-units \
 		src/test/compile-fail \
-		src/test/compile-fail-fulldeps \
 		src/test/incremental \
-		src/test/incremental-fulldeps \
 		src/test/mir-opt \
 		src/test/pretty \
 		src/test/run-fail \
@@ -165,7 +153,7 @@ check() {
 package() {
 	cd "$builddir"
 
-	DESTDIR="$pkgdir" ./x.py install
+	DESTDIR="$pkgdir" python3 x.py install
 
 	rm "$pkgdir"/usr/lib/*.so \
 	   "$pkgdir"/usr/lib/rustlib/components \
@@ -301,33 +289,23 @@ _mv() {
 	mkdir -p "$dest"
 	mv "$@"
 }
-sha512sums="d6688711452295c41468af214f036499074d82fbeedc3f03560275219c2fae910e623e38e3210176d86f78ba5533ea098da5ff21532c8ad1a5aac132bb74ee02  rustc-1.31.1-src.tar.xz
-16596561ff87c66f64f4b40602184355d3695822b9b9e6e0e929f340664718698e6f5b378c9162b48f9cb180be5fd8e583e5e51a1c57c1cd55dcc80f468cb509  cargo-0.31.0-powerpc-foxkit-linux-musl.tar.xz
-cdfc7a3d51d66338f31007daafab95570e4e465983add99db7a45f1a3e601588b19e1257fe3e7fcc6b7104ba445add2fa1cda71325a9ab6d196b4ad0dcef2fb5  rust-std-1.30.1-powerpc-foxkit-linux-musl.tar.xz
-190ed9d84513a229f389fc5d1bf0b8e22202bd3b9802330ee2844c436ae13700bdaded091498be4f2c4c65b2f6ef55c1e2db41a918747ac60e8e11e331be2c29  rustc-1.30.1-powerpc-foxkit-linux-musl.tar.xz
-acab7c5ffa73cd83cf3ae23e69d2c05ccc3ca03aa4d5a15179af76f2e75b7c5a1bc8d2969c0a9a4b5ad36a50a8cce283e62db878797be6d0da252b414de004cd  0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch
-f9773277e91e91d0bd6749890b8d332a86522927d90548af02892c6d01b8fbb3b234993eec8e5b8d6a3b6f1cec310a112e274f47f70d30829ca61a0da8d45bb5  0002-Fix-LLVM-build.patch
-9e87964d41e14f70acc1961a0162bbf3ebca73f1c2b2842c3b1c8b65776466c9299d6974fc6b94a4e06547ae8ce638c28cdedf24eeb2616976f9dd727b989c13  0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
-b08e247785b6b94c24e9921665c0a80a21d6802cdcfb67cf381ff8c674388156fc6d88f8206c2d1eed152f4ad3333bf4a16cdd1c3376b97500f96c437e967ecb  0004-Require-static-native-libraries-when-linking-static-.patch
-39c2f63aaf567e539ef803afa4e02d9f373df33167306dabb303044854c95bcc52a8b0fe02a2ff186d3d37fb25ac6ceee2bea25beddb0b8d0510b41dcbfb781a  0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
-80a48ba90dce672bd47dba4358e705f0585b17af6a9236887c0bf79d229fe7250b6d5cf54c2630c132721be890cf6098376aac408ac2d3feb5fd8b5ec0678446  0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
-71fc70a70ee42fed66ea7abcccffd46c02b877f716ccb366d68c8b252290366aa3d4819bdf6ce43cf8327088ff9ff0cac9444d9fab8b4d6645dfc1a018bd5285  0007-Add-powerpc-unknown-linux-musl-target.patch
-54e7b24d3da6905d02252dbd3011a16c52c1fae6922997dcccf034b5230025e05bb0d029a5fe043c186a39f8908e8e44f9a857db943f1c49d804bcb97cca71b0  0008-Fix-powerpc64-ELFv2-big-endian-struct-passing-ABI.patch
-088d509715de07000c815005fd513d4bb43c5a273dab1cec54c3617c1d342d1eff7d4d2edc48f20b80aec8b3e380f7480d7336b9c7dc4b89b78a31a88e04eb09  0009-Use-the-ELFv2-ABI-on-powerpc64-musl.patch
-f39578109d1591759aff29cc1a4127f1456c60ed05993704574a9c1e2331243baa85e3f66ba4634f57efd964b1d11a4539a3ab3a1fdab9c3163d91c658e04bf2  0010-Add-powerpc64-unknown-linux-musl-target.patch
-11ee5b81d354b36369eb5d7f57bcde04a350f1ca5e6034d04eae6c5064dad37b05a26ca44f99499f3f7664c11beba0aafbc1adb6807a21bcce878717659d04b3  0011-rustc_data_structures-use-libc-types-constants-in-fl.patch
-8ff473da3fd668ee36826e206245c7b6d20c671b4016c9a9d5e1d22af05f8d4d724543942a53ab38dd9c7bb6e4c3eff33daec4a84b0ee333b25b007f610b4b49  0012-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
-1ce5797d0b9a0eb24d203a437b999ac9691cf741086645864b3a0dcf134f31c31e68e6e1618f44d3bd3c3743c067713c472e93c69f551d14f2e0233b6f10d2cd  0013-Fix-double_check-tests-on-big-endian-targets.patch
-f72c803cd531e6c85c37993214a89a8e49d776a6f50405956d6b453cc9036e596eeac4da36c564fc9388908237fe37291dfc6a0d00ed1d5f83186371f8ad6c07  0014-test-invalid_const_promotion-Accept-SIGTRAP-as-a-val.patch
-861402c0468438428aefdbcec13c82678ba280816f5482a5707805caa37ddabf8df95d894dd0ab99d3e0b09de3b0a602cb29e62afd479cedf6112950ed174f9a  0015-test-linkage-visibility-Ensure-symbols-are-visible-t.patch
-1dec944575e8bb6fc7ad910e2dae4d694a2571b36652a27a9b7ee11c40018d39d41f89bf827d909a67ff4d16d0970d1c753b24dfd5dbd0362028dcf12f60dd61  0016-x.py-Use-python3-instead-of-python.patch
-9633256006c28106d9b5e560e4cd4ee72de700a0f54d0c5fd1576760213e674f3c123b83a547bbdf9cdfde92ba6d10edf3cb598f3ad67db6e20b11d24fb49d54  0017-test-target-feature-gate-Only-run-on-relevant-target.patch
-3ab705f45cc75507c5a8fbf7c8520c7231d7d1870e5dc5da3d822e50f28a6f242ba31e712f98f72ff96143010812212cdc99f8b1b197a680bbe249dfb9779d74  0018-test-use-extern-for-plugins-Don-t-assume-multilib.patch
-572669f940c93b57b1f02161685bd3e35e2757bfd1f1d2e6ca5fd7d6e80c6733917a2c28205c4bc8741eae01bd790fe14996ba857884494a6084f4670819e43d  0019-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
-e1cd1bc3a363ce214e887c4c61e233d388c3b75155ae4a84e8381bdccee5897ddffc992bc22dcdb6316b64516236ae4b07d06ff331e9e031c524196b0e5c40d5  0020-Ignore-broken-and-non-applicable-tests.patch
-b05ef2ddd53262e46a4a6148db25b0903347e531f94a1ec194aafd31e49b4559564edbe4842f82b457d9c700723474fa29119f57969c0208199d5f2126ce6509  0021-Link-stage-2-tools-dynamically-to-libstd.patch
-34ce4f9227a0e58113e8871db78681d1a0180f4af9de08b17c7ba15d13f47d189e2b0c66cb203ddfee8ac29131b6e5bc7ba8fd699d63847ab2a55973503788bc  0022-Move-debugger-scripts-to-usr-share-rust.patch
-6204dfc16ca27bda4c77a5f9a3805af9995e24c8b9cda6d45d0860c3625e937ec6e871a3ccec6357ab4cd52b0e73450897960102bb1e6f1ce80ae95780a8dbea  0023-Add-foxkit-target-specs.patch
-f94abe390798b968bccfba1c908ab5895220ed0d167314b790a9c28b10cac81fb2e3b08760b4e8551ad5a5d02cd052d3d0d647ad8f8634e97f4d3b0470a21c42  0030-liblibc-linkage.patch
-875f0b676c61c1ec67894fc7866233869ced8fc975960b8b99585bad370066f9a6bf591590a745c73a0bcc93b9f7fda74a703829c50d04b80846aecc92ae725a  0031-liblibc-1b130d4c349d.patch
+sha512sums="3291e4e19f75f44c81e6fcf4c01edc7c9d326eca43722381231abcf2e99f4314059ba59a29b79f5511ad9421c358c45e8fe18584d6954d17fe2aabad0f9d9147  rustc-1.33.0-src.tar.xz
+24caa7730dd41f61b97bb909d499f928cebab948e814b786e7d3836e92188ef27da48147532e063b3cec424e41a4374581274f21dc79bb95cf310f92c8609579  cargo-0.33.0-powerpc64-foxkit-linux-musl.tar.xz
+c6d237d6daaae1e8a342691917bdc76fa6a59f5bd99a1df38baebf6d5c1ddc6f8460ac6e1db8168120accb9c5f90f652ea013b4d865c486c72e90244be753ebd  rust-std-1.32.0-powerpc64-foxkit-linux-musl.tar.xz
+8ff3bca961e146593f17e1581d20eaeae99768a4fac65258cf5ef80ef69b427a4980fd345b69b831028ca3e882d52d2ebd42a2eccab2c812da09e2bc28960ffe  rustc-1.32.0-powerpc64-foxkit-linux-musl.tar.xz
+a5e03a091b224b9cd3cd6d8a0b1ac70389f374c95ff09f55b01e739b3a98a8551d2208b2750137ebaacbb8628d1bb54a96aaeb938c961e4eb33a071594bce1dc  0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch
+bf387aad3d117e30621bd1914c3a713a710db0639413d57802c3a9bba49bf422dedf5e03b4a3073ec1efbd571cbcd10b6a0b3f98f2b019555581db5599b84f44  0002-Fix-LLVM-build.patch
+b931204afaf3ac4c73f41c29586b0cebdb06867bf401717a473c2367ebf25be1a42827f7ccccea50c15006c744cb73fc7ea9627816d0a2b53421546a4e478436  0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
+da362880f89a2df8223ed255d44803e9d7d8115666946fe3a4fe4a78030cd8ee40d6aabc1ceaab110e62e9a67af7631729348f71f2d514458ef0a60e6decff3b  0004-Require-static-native-libraries-when-linking-static-.patch
+1bdc441cb068697c7f6984e16bdde28bdd17b7a2517c33b666851d55f1d987a76e4d7f034b7221538c663c0a33603d8ac1f60ffb167a4a5d01677a7b214ab21d  0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
+03580acc8391a7b32fb2a7880c6a924838803e8ce4771e465f24b7a09263b9b0ca7ae4fd84770c262cf25734d49ab0f838d57104b181224b901e26f25dc9d2e9  0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
+8e06768d0723aca0dd292942381255061b83505da89bc45c8c8c280dcaf3184e1b05b3744559fc3ed576f9a726bd593d892a71e8fd81bfebee62bb86d62f5531  0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
+52138d4cc238ee44eafabfe281e3378298d510c9ffd9f123a5934f33b7e68b6fa262605c044bfce5943b18983d0145bdf33b9c168e030fee892247ef7ce4ec19  0008-test-enum-debug-Correct-minimum-LLVM-version.patch
+34be92c7ce327f488b7a933e7232890615b3d07c08a09028d712c01aa53f89025b47aaaccdc5c2e1d52948eb967b40ea2c576b29b0102feadc7153d6d9984f79  0009-test-use-extern-for-plugins-Don-t-assume-multilib.patch
+47b025edccb7e2d7c42353c3a8665714a3b5661a7d832a9bd71bf9bff75ffe7c6e90a9d55b765dadec54ce29c2539fa894801487718ac1053bd4528b413a487d  0010-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
+c32c5d807ec23f5e88f47f83220a117ff3f048cec4731e50d0cae082c971ea03993a6e4f95225046a0b06b406608ee97fb85671ad8f86e5da4970bba210388d6  0011-Ignore-broken-and-non-applicable-tests.patch
+6b089c21b3b756d5d8b3198f4a914d8a2f90216ce25d491f7caeb0a637d0f729e9e5184dfa3e07b50570df5791576d1aa4bf2a1f33183c67bc2ba6ba36c0752e  0012-Link-stage-2-tools-dynamically-to-libstd.patch
+d9568a3e21b60831b193c4a9554756d0be77d0c63d06d6c3ff1c7fd35822aaa3b2e2cf8acd29fe07eb698ebf48673245e052a6ddfa4d39bb687eea8c4c236e50  0013-Move-debugger-scripts-to-usr-share-rust.patch
+f1269241ccddf4594752b97e6856dad98ca987d2491b1bd95f6123352eec52f3acb3f17dae1c2a42be55e25db4a7e0d6bb1fb2b468cc139ad14559e0753a4c87  0014-Add-foxkit-target-specs.patch
+7197503a3bf1cdd6cb5ff3350add2682cc64f7d33f7a4b270c53321401e439de5c24ddb2f7c5a76bb3488c8b766237f674fedaa9202c480f53595d7837214f0f  0030-libc-linkage.patch
 41ab9d6f361ee2fba267c9836c1a382dc86101d1bfb59cd942be8e8fc526ad65d845c9395cba7f760808d345d107f32e75af9057d67c450b8fbdd8a73636fb2e  0040-rls-atomics.patch"