diff options
| -rw-r--r-- | lang/rust/Makefile | 22 | ||||
| -rw-r--r-- | lang/rust/distinfo | 115 | ||||
| -rw-r--r-- | lang/rust/patches/patch-src_bootstrap_bin_rustc.rs | 6 | ||||
| -rw-r--r-- | lang/rust/patches/patch-src_liblibc_src_unix_solaris_mod.rs | 13 | ||||
| -rw-r--r-- | lang/rust/patches/patch-src_llvm_cmake_modules_AddLLVM.cmake | 8 | ||||
| -rw-r--r-- | lang/rust/patches/patch-src_llvm_include_llvm-c_DataTypes.h (renamed from lang/rust/patches/patch-src_llvm_include_llvm_Support_DataTypes.h.cmake) | 10 | ||||
| -rw-r--r-- | lang/rust/patches/patch-src_llvm_include_llvm_Analysis_ConstantFolding.h | 17 |
7 files changed, 101 insertions, 90 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile index c1cfa5e3153..e5023f5c47a 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.50 2018/09/03 16:56:24 ryoon Exp $ +# $NetBSD: Makefile,v 1.51 2018/09/14 10:04:43 jperkin Exp $ -DISTNAME= rustc-1.28.0-src +DISTNAME= rustc-1.29.0-src PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} -PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/ @@ -51,6 +50,8 @@ TEST_TARGET= check CHECK_RELRO_SUPPORTED= no CHECK_SSP_SUPPORTED= no +CHECK_PORTABILITY_SKIP+= src/vendor/openssl-src/openssl/.travis-create-release.sh + # Required for LLVM (-std=c++11) GCC_REQD+= 4.8 @@ -68,7 +69,7 @@ BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--enable-new-dtags # own bootstrap. See the stage0-bootstrap below for more details. # DISTFILES:= ${DEFAULT_DISTFILES} -RUST_STAGE0_VER= 1.27.2 +RUST_STAGE0_VER= 1.28.0 # .if !empty(MACHINE_PLATFORM:MDarwin-*-i386) || make(distinfo) || make (makesum) || make(mdi) RUST_ARCH:= i686-apple-darwin @@ -96,7 +97,6 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} .endif .if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) RUST_ARCH:= x86_64-sun-solaris -RUST_STAGE0_VER= 1.28.0 RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz SITES.${RUST_STAGE0}= https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} @@ -104,7 +104,6 @@ RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH} .endif .if !empty(MACHINE_PLATFORM:MFreeBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi) RUST_ARCH:= i686-unknown-freebsd -RUST_STAGE0_VER= 1.27.2 RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} @@ -117,7 +116,6 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} .endif .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi) RUST_ARCH= i686-unknown-netbsd -RUST_STAGE0_VER= 1.28.0 RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz # Do not trust ryoon@. @@ -134,7 +132,6 @@ pre-build: .endif .if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) RUST_ARCH= x86_64-unknown-netbsd -RUST_STAGE0_VER= 1.28.0 RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} @@ -162,7 +159,7 @@ SUBST_VARS.rpath= PREFIX post-extract: set -e; \ - if test -e ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}/install.sh \ + if ${TEST} -e ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}/install.sh \ -a ! -e ${RUST_BOOTSTRAP_PATH}/bin/rustc; then \ cd ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}; \ ${TOOLS_BASH} ./install.sh --prefix=${RUST_BOOTSTRAP_PATH}; \ @@ -171,7 +168,7 @@ post-extract: fi # patch(1) in NetBSD does not handle .cargo-checksum.json like long width file. cat ${WRKSRC}/src/vendor/libc/.cargo-checksum.json | \ - ${SED} -e 's/2613f2912a9e8f3485debba424437608433b4e1c8b9050176ef975efdf4a412e/52431d3cc74033804febaa303d028811504c07e2b9b83ec7287d9ee159bf35fe/' > \ + ${SED} -e 's/9c6af198a2f80da827054784faf70bc404673d9568fb45664b4f73c46245fdbd/c3851969a854d6ccaa8a94369f1288025149d1ebdc74b36f224423f35b18f7a7/' > \ ${WRKSRC}/src/vendor/libc/.cargo-checksum.json.patched ${CP} -f ${WRKSRC}/src/vendor/libc/.cargo-checksum.json.patched \ ${WRKSRC}/src/vendor/libc/.cargo-checksum.json @@ -185,6 +182,11 @@ PKGSRC_MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH:Q} MAKE_ENV+= OPENSSL_DIR=${SSLBASE} .endif +pre-build: + # Requires libssh2 defines only available in master. + ${CP} -f ${WRKSRC}/src/vendor/libssh2-sys/libssh2/include/libssh2.h \ + ${BUILDLINK_DIR}/include/ + do-build: cd ${WRKSRC} \ && env ${MAKE_ENV} \ diff --git a/lang/rust/distinfo b/lang/rust/distinfo index adacae0c768..c098f692fc5 100644 --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -1,84 +1,85 @@ -$NetBSD: distinfo,v 1.35 2018/09/03 16:56:24 ryoon Exp $ +$NetBSD: distinfo,v 1.36 2018/09/14 10:04:43 jperkin Exp $ -SHA1 (rust-1.27.2-i686-apple-darwin.tar.gz) = cf471217c9666c18a666e2b0faabd5a30d44010c -RMD160 (rust-1.27.2-i686-apple-darwin.tar.gz) = 3910f9fac8babb80c5c84e3de8567ed530ab808f -SHA512 (rust-1.27.2-i686-apple-darwin.tar.gz) = 44f9a9cf43ecbf4e9c3c70d03971fe17774d5d5adf630114bc18024233bdb59cc4d01d22a7591d0717aa4dbb517013d15519505a16b862ca77b29a457a97d625 -Size (rust-1.27.2-i686-apple-darwin.tar.gz) = 177655655 bytes -SHA1 (rust-1.27.2-i686-unknown-freebsd.tar.gz) = fba9fff4437138b0c66fdd10314d24abf63b1483 -RMD160 (rust-1.27.2-i686-unknown-freebsd.tar.gz) = a9b7555b11bae4afeefe0083bcaec76dc5ca9bbd -SHA512 (rust-1.27.2-i686-unknown-freebsd.tar.gz) = 981075144d4ee69593d91de839f28c2d6dec7b723999adac32ab20bd9582d1495e94c5a76acf371cf3a09dff9f73ee42b0512a890699f9cef41f1fb1bb462da1 -Size (rust-1.27.2-i686-unknown-freebsd.tar.gz) = 150817534 bytes -SHA1 (rust-1.27.2-i686-unknown-linux-gnu.tar.gz) = 12a5c7bc2c36be8a6ffed96963893280edac1e89 -RMD160 (rust-1.27.2-i686-unknown-linux-gnu.tar.gz) = ade589d0a98d5e6460e7f3594f743d1d7d7ffd76 -SHA512 (rust-1.27.2-i686-unknown-linux-gnu.tar.gz) = d5e36d0c5e022b590445c6526bfa94e0c991c0d057f07f4d3ea596a5c3b80ab7cf121c9534dfd97e4925eff26c0fb2a7fcee8e95eb7d4b1a2b2b6f6ad4448dc5 -Size (rust-1.27.2-i686-unknown-linux-gnu.tar.gz) = 225459139 bytes -SHA1 (rust-1.27.2-x86_64-apple-darwin.tar.gz) = 763b2af0d2c62765f564170fe37a957e3f573344 -RMD160 (rust-1.27.2-x86_64-apple-darwin.tar.gz) = 2738579049fa2cf1156efc79dc2dfb83082c5e70 -SHA512 (rust-1.27.2-x86_64-apple-darwin.tar.gz) = 53817892ef020fa2388ebf9dc9d7d6cfa36553ed163967cc0319a76b73db6e3fce825fd51d3cdcf202614fd2015546ee8ca5a2b61c517730a7dfd1a950b51d1b -Size (rust-1.27.2-x86_64-apple-darwin.tar.gz) = 180680593 bytes -SHA1 (rust-1.27.2-x86_64-unknown-freebsd.tar.gz) = 0e4614dcdd4492b0babf30ee66a75a59577f1733 -RMD160 (rust-1.27.2-x86_64-unknown-freebsd.tar.gz) = 662f4bfdaf3adedf0326873f6f410bf1f0492034 -SHA512 (rust-1.27.2-x86_64-unknown-freebsd.tar.gz) = 94a8994de9a4a96446ff3d57e98f6b45ba7f5e5e2171a1e500f12595584eadfa884dc1b12f856257a9d7a21657b9f9f90e4046363e889d4ef9d9f81ecc627c09 -Size (rust-1.27.2-x86_64-unknown-freebsd.tar.gz) = 149727861 bytes -SHA1 (rust-1.27.2-x86_64-unknown-linux-gnu.tar.gz) = e6c4b93cb8ded56b6a9e703dec27ff8a904ff629 -RMD160 (rust-1.27.2-x86_64-unknown-linux-gnu.tar.gz) = 90d1a3887865a72eea67e0c25bb3e9b5f531a2f7 -SHA512 (rust-1.27.2-x86_64-unknown-linux-gnu.tar.gz) = 964c3fc6490e0cac38225a29992a6d27133f0dd3f4f61ffe8a6f6c5c69b217a37d3efedfc2aade96b36aeddfa3dca53e460cbe42a22e256167cdd0e55c2df434 -Size (rust-1.27.2-x86_64-unknown-linux-gnu.tar.gz) = 231365190 bytes +SHA1 (rust-1.28.0-i686-apple-darwin.tar.gz) = 85d947b4d260361f63f77e1f4921ac89bd849d78 +RMD160 (rust-1.28.0-i686-apple-darwin.tar.gz) = 963abf1b0b5e2673c8e2d6c1b4d5a2d8ed9d8d2f +SHA512 (rust-1.28.0-i686-apple-darwin.tar.gz) = cd38065e1b3c8f466ed5b7f73ee8e0880bff6c11cdff95d232ad7d829eafccd3b76c75fc217a4d39238f1ca3ac010b3bb54b15ebfbaabcc7a01366aae8bc16dd +Size (rust-1.28.0-i686-apple-darwin.tar.gz) = 182649730 bytes +SHA1 (rust-1.28.0-i686-unknown-freebsd.tar.gz) = 458f684bb2f9f09f79d2af3fd4b1c58f27be894c +RMD160 (rust-1.28.0-i686-unknown-freebsd.tar.gz) = 8865570a7facbeaf988e46d5f80dcb05cabee8ec +SHA512 (rust-1.28.0-i686-unknown-freebsd.tar.gz) = 493c1dddcdd4393d07d5e132b3ef672fec8d3bfa1818709b7da3b50bef0b1f7d7cf4ceee240c99ef98278fa164bd03b170d00d6dd8a2f5b431985ddd4b642777 +Size (rust-1.28.0-i686-unknown-freebsd.tar.gz) = 156166037 bytes +SHA1 (rust-1.28.0-i686-unknown-linux-gnu.tar.gz) = 751f30430158d66537dbb393839835af3438d1e4 +RMD160 (rust-1.28.0-i686-unknown-linux-gnu.tar.gz) = 649b4760afe12715b3e9352bad058bc3b6fdeafb +SHA512 (rust-1.28.0-i686-unknown-linux-gnu.tar.gz) = 40fc0c6e347f60ab3809e95edabafd88e9160f8adaa217562a9c52fea42f540ca142eddd827ba16960bef8faa9401b37a963d29baa235aa84eb760c2a78a2c4f +Size (rust-1.28.0-i686-unknown-linux-gnu.tar.gz) = 223358542 bytes SHA1 (rust-1.28.0-i686-unknown-netbsd.tar.gz) = 2777717661d9921db45c93347ffb383cb9f7ebe4 RMD160 (rust-1.28.0-i686-unknown-netbsd.tar.gz) = 768dc60e1983c5bcc6768ce6a0dacdc199ed6f9c SHA512 (rust-1.28.0-i686-unknown-netbsd.tar.gz) = 98f60b1357d8dec31752cb0f786b4c1fd8904b0e218d0f564bdcb2afc33f3fb0eb574a0e10f814a3ccfae113f27017daeff167cc06592221a755d9c36205bb12 Size (rust-1.28.0-i686-unknown-netbsd.tar.gz) = 161223497 bytes +SHA1 (rust-1.28.0-x86_64-apple-darwin.tar.gz) = ac439a54988a471e1e7652596307a9b54a253dd7 +RMD160 (rust-1.28.0-x86_64-apple-darwin.tar.gz) = 47479635f259e33218ee0e63b389e7f2c83278e5 +SHA512 (rust-1.28.0-x86_64-apple-darwin.tar.gz) = 99a3a5c5d0d09aa7ae8b52e5c71df56ead2d9c730921120c668daf6dcd6b9856e775735533ffc6f52f9481f591800ab81d0d7b43f534d2fa32e80d2a7dec8cde +Size (rust-1.28.0-x86_64-apple-darwin.tar.gz) = 186975346 bytes SHA1 (rust-1.28.0-x86_64-sun-solaris.tar.gz) = c363feb0f9134ff1be95ecbf3b5a5483ecc18d33 RMD160 (rust-1.28.0-x86_64-sun-solaris.tar.gz) = a5c54fe02747d657a14f671e93dc2e6146bdbe19 SHA512 (rust-1.28.0-x86_64-sun-solaris.tar.gz) = 6d4cb7051b29603f9d3b61afc93b50d8e5ff6b8d608dd8f1a9c8210441a2d6059b5c61b4e0d21b9eca99f7c979b406b02b0e50cc60c621dcb5a0d528e89156b2 Size (rust-1.28.0-x86_64-sun-solaris.tar.gz) = 186978879 bytes +SHA1 (rust-1.28.0-x86_64-unknown-freebsd.tar.gz) = 7bf31bc3447350d9bae27ff687361268358c3c65 +RMD160 (rust-1.28.0-x86_64-unknown-freebsd.tar.gz) = c2b40f15f7151b01943ff388c857965a96000590 +SHA512 (rust-1.28.0-x86_64-unknown-freebsd.tar.gz) = 242981ab0dcd4ea549e156ffc8ff4e1b572ff39718b0b55dd62be0272c4c51901b28d49684a7ec5534ed634d4bbdd001b692253deb1b48fc9c005751670b012f +Size (rust-1.28.0-x86_64-unknown-freebsd.tar.gz) = 154797610 bytes +SHA1 (rust-1.28.0-x86_64-unknown-linux-gnu.tar.gz) = 30821a61037f25ad4ac4190b579783ad5dc2d2fe +RMD160 (rust-1.28.0-x86_64-unknown-linux-gnu.tar.gz) = 8c9c17d504e0568ba090f33b36683874d50032c5 +SHA512 (rust-1.28.0-x86_64-unknown-linux-gnu.tar.gz) = 6bdcb8828e14069e099764b79671579bd24c90a102266fa5ebd9a5da3da7186b3e1d64b53c6c065d2d1a4d71b6c613513fddb38cd21c3d37a4a112b0393542a2 +Size (rust-1.28.0-x86_64-unknown-linux-gnu.tar.gz) = 220419012 bytes SHA1 (rust-1.28.0-x86_64-unknown-netbsd.tar.gz) = adf649042d6d8fa4e3e3884764983334a05fcc1d RMD160 (rust-1.28.0-x86_64-unknown-netbsd.tar.gz) = 7528a7c33006cbf3babd919f07c6b45aa40c933e SHA512 (rust-1.28.0-x86_64-unknown-netbsd.tar.gz) = 240b8de758469259aae3e7e8168a4dce1d62da864cae4ea0386fb6f808a19098bfb757526f22759355c62eb82c5eb31a0141b04ac32e669fb4b072232ea76f41 Size (rust-1.28.0-x86_64-unknown-netbsd.tar.gz) = 156843116 bytes -SHA1 (rust-std-1.27.2-i686-apple-darwin.tar.gz) = 3bf62ff668cf36613d0a4053c414475cbc59c64f -RMD160 (rust-std-1.27.2-i686-apple-darwin.tar.gz) = 5b9995ee10e44e07216e4116fe0f9f6a8bbc153f -SHA512 (rust-std-1.27.2-i686-apple-darwin.tar.gz) = fc96a42d29d924ef4623313bbe5444dc73e7ae6f4f2ccc9ee8afca5f2f8a9a9098a9bb1f28c5270dc60ee0e977b2f8564d728ca3d15974b2fed965686918aaa7 -Size (rust-std-1.27.2-i686-apple-darwin.tar.gz) = 58461164 bytes -SHA1 (rust-std-1.27.2-i686-unknown-freebsd.tar.gz) = f224064e3579b73ec8b24986f99c1517779b0627 -RMD160 (rust-std-1.27.2-i686-unknown-freebsd.tar.gz) = 7ca42573b269139f19e8c7ff26ab2f7d53315004 -SHA512 (rust-std-1.27.2-i686-unknown-freebsd.tar.gz) = 26ac91bc258ff98014f7d5075821e79abd22b9a1424e7fa079605f3036eafb84e43073d8796c88372efbf638e812ee093abda6e196cbd1b8e93af5dda8fe659b -Size (rust-std-1.27.2-i686-unknown-freebsd.tar.gz) = 65134371 bytes -SHA1 (rust-std-1.27.2-i686-unknown-linux-gnu.tar.gz) = f33c22e5184567d3989adb38ced7bda6d28c37b0 -RMD160 (rust-std-1.27.2-i686-unknown-linux-gnu.tar.gz) = 1c2f8990394f4b396c51fc6ee9790df6b5c71eae -SHA512 (rust-std-1.27.2-i686-unknown-linux-gnu.tar.gz) = 309b4e7370a0cd3e7b69f760a8b94f0908e06ebbd07b951a65c4106722d1e0e299d1256143f9d09e61a6b9034a1e2fea39312285d184e61c30b5b2d6ff8706eb -Size (rust-std-1.27.2-i686-unknown-linux-gnu.tar.gz) = 69804714 bytes -SHA1 (rust-std-1.27.2-x86_64-apple-darwin.tar.gz) = c913d9914a79db3ba52a88a24ce7209b85c2c71f -RMD160 (rust-std-1.27.2-x86_64-apple-darwin.tar.gz) = b53c9da47baa5ac68cc21b938b32da19cb2e4762 -SHA512 (rust-std-1.27.2-x86_64-apple-darwin.tar.gz) = 1839d9d188673056a322b16b8946f107258167704b8eda9a6185e222a613ea59a42e643a669b049260ec0053e30fe0262193ed006f99cc89ce4b38ce83810200 -Size (rust-std-1.27.2-x86_64-apple-darwin.tar.gz) = 59590803 bytes -SHA1 (rust-std-1.27.2-x86_64-unknown-freebsd.tar.gz) = a83ea7fbedb742fa2fbe39e7af7c987129a3687f -RMD160 (rust-std-1.27.2-x86_64-unknown-freebsd.tar.gz) = d8094a34610ea60210c5fdbc2e635fa23e6852c6 -SHA512 (rust-std-1.27.2-x86_64-unknown-freebsd.tar.gz) = 7d2358a4de2d094caaf3df7b06b2d3a0cb66f2abd95e0fc2d7eadddaef949afdbe7defbbf5a40768cc1aee70c4403195db042f4b9b8a91f4bcab5e93299ec38c -Size (rust-std-1.27.2-x86_64-unknown-freebsd.tar.gz) = 64679308 bytes -SHA1 (rust-std-1.27.2-x86_64-unknown-linux-gnu.tar.gz) = ccf68df5d7379e7c02877cbb774163533437320f -RMD160 (rust-std-1.27.2-x86_64-unknown-linux-gnu.tar.gz) = 9ac4cceac33d4b4e20314a838c00449ee47ea27c -SHA512 (rust-std-1.27.2-x86_64-unknown-linux-gnu.tar.gz) = d7481690f73e9bc2b0ee8ba9bf21e81c803514cba63018a5999761497c0d50ebb0d809aec450e868467c7620dbaa8c3215e1cddc0eeb7863ffb96e96260b6a87 -Size (rust-std-1.27.2-x86_64-unknown-linux-gnu.tar.gz) = 81226682 bytes +SHA1 (rust-std-1.28.0-i686-apple-darwin.tar.gz) = 3d7e57f639077394756329121c74fb80c7e4bbfe +RMD160 (rust-std-1.28.0-i686-apple-darwin.tar.gz) = 2ef3358883cf2951a55495f4db12f40412fd5dc5 +SHA512 (rust-std-1.28.0-i686-apple-darwin.tar.gz) = faacce3c4441e96927aa52dbf89e70541d3d4d73d1ae971c61b5d9c2ce75e4b55ed4faccb3c314fd9ea9feda4b5630e425a5c725e4c98df80bdb7b1e822a5439 +Size (rust-std-1.28.0-i686-apple-darwin.tar.gz) = 60854124 bytes +SHA1 (rust-std-1.28.0-i686-unknown-freebsd.tar.gz) = 5b263dc0d78eeff10dd34f1b01b61d24bc652c57 +RMD160 (rust-std-1.28.0-i686-unknown-freebsd.tar.gz) = dc36068798fee727bda7693724f9510fd62ab7df +SHA512 (rust-std-1.28.0-i686-unknown-freebsd.tar.gz) = 84b9b795dc5a91aa5211ea4b0c0002964fb51d84a616c5e49b5ba5949268a5eb74c438b1b4a34e295e2cf7093ed4154ad7c679777639d82c4fe3a84e68f5629e +Size (rust-std-1.28.0-i686-unknown-freebsd.tar.gz) = 67392915 bytes +SHA1 (rust-std-1.28.0-i686-unknown-linux-gnu.tar.gz) = a94ff9d5203fbc40c4b6dea07161e476df4bbd97 +RMD160 (rust-std-1.28.0-i686-unknown-linux-gnu.tar.gz) = d925219f9afa726d700416e87321bfe14c6a9959 +SHA512 (rust-std-1.28.0-i686-unknown-linux-gnu.tar.gz) = 08e52328d2dd09633118a7315c364487624189d0e7ce7fd649c6355ae690b1649a88a477ef93f8ed22fe270b67cf8db381182994d692214bff844c0175fd5e88 +Size (rust-std-1.28.0-i686-unknown-linux-gnu.tar.gz) = 69177053 bytes SHA1 (rust-std-1.28.0-i686-unknown-netbsd.tar.gz) = 047d4fe3e4bc8652a28614f279c097015e3434de RMD160 (rust-std-1.28.0-i686-unknown-netbsd.tar.gz) = b42be603e6ad629ffb792073b9e3acf968ad5706 SHA512 (rust-std-1.28.0-i686-unknown-netbsd.tar.gz) = 04b360dd7af0b89a6efb4b6b83fc0770da819c2f0403b6dadfffe824a93a02b1dd92605e390b70192af24a3be5071444cb6213a3245e49058648e168846791ae Size (rust-std-1.28.0-i686-unknown-netbsd.tar.gz) = 69614010 bytes +SHA1 (rust-std-1.28.0-x86_64-apple-darwin.tar.gz) = 55af539d98707a658a8f26a4aa33005b4fc6baa3 +RMD160 (rust-std-1.28.0-x86_64-apple-darwin.tar.gz) = 2744209ed7312b445370f8d008db325045fcea18 +SHA512 (rust-std-1.28.0-x86_64-apple-darwin.tar.gz) = 7075f6cf594847fb21c134a32f9d758cb94a4483e669eb546c9df68108541301d9a750c535112cbfbfa5dc1f9ff93a6edc6c3c366cb97d927e6e8367ccb9efec +Size (rust-std-1.28.0-x86_64-apple-darwin.tar.gz) = 62068044 bytes +SHA1 (rust-std-1.28.0-x86_64-unknown-freebsd.tar.gz) = 5945566a0cd3416b4faac450f61085cc24a7485b +RMD160 (rust-std-1.28.0-x86_64-unknown-freebsd.tar.gz) = 2f61d14a2424b9a2394ef2227384c11271aebbf4 +SHA512 (rust-std-1.28.0-x86_64-unknown-freebsd.tar.gz) = 5ac101ea5e7a676a903a394c8628c2b5cee32d7c025b88f8382962638ae902f20d811642254151890f798fb4a05adc72cd36fa01d1d089d14cca56923088fd35 +Size (rust-std-1.28.0-x86_64-unknown-freebsd.tar.gz) = 66920885 bytes +SHA1 (rust-std-1.28.0-x86_64-unknown-linux-gnu.tar.gz) = b880e4436248c51da6776a4378a05be7886be509 +RMD160 (rust-std-1.28.0-x86_64-unknown-linux-gnu.tar.gz) = 831bbd7a38fa891da58dbe42235d74ff1f17e35e +SHA512 (rust-std-1.28.0-x86_64-unknown-linux-gnu.tar.gz) = 643e38728d6a13e0b73e498a9dfa65daafb24642591263729f06e4caa369b079985d55c9d36fb5692dc6f2293abd65390323cbd4a52a306a194b17172fbaff07 +Size (rust-std-1.28.0-x86_64-unknown-linux-gnu.tar.gz) = 70422036 bytes SHA1 (rust-std-1.28.0-x86_64-unknown-netbsd.tar.gz) = a0b835fe0ad2b5a6d94bd99323dd3174a939949d RMD160 (rust-std-1.28.0-x86_64-unknown-netbsd.tar.gz) = d06cabb8232d66d2a5cf3a1ee0f0f676c698e6c0 SHA512 (rust-std-1.28.0-x86_64-unknown-netbsd.tar.gz) = 726c5ef43db24b3d0548a2b0534934d6fcb04b0b9228b80cace18f59e21ad6facfbc2af3220867988a35414ba95fb90e38cc47d826dd73cb588622132ea6e9da Size (rust-std-1.28.0-x86_64-unknown-netbsd.tar.gz) = 69236192 bytes -SHA1 (rustc-1.28.0-src.tar.gz) = 2256655a8e20e4ce29dcc2219079d9e418058690 -RMD160 (rustc-1.28.0-src.tar.gz) = 97497baad42d04cb4157e02dc6a2d1b065117065 -SHA512 (rustc-1.28.0-src.tar.gz) = 4e4f121ee5a8a9f8e1ddb6ca5a0c43ba15c1349ecea9478fbcd0b242bf438b498f76bee97d33b9e078a47395e44cdea4c5aa0941e7dd21167abdf94314ef10ce -Size (rustc-1.28.0-src.tar.gz) = 97756918 bytes -SHA1 (patch-src_bootstrap_bin_rustc.rs) = d9787517f03162d3548e89a91ecf933fd67774d8 +SHA1 (rustc-1.29.0-src.tar.gz) = a8eabf047a54a9c867182382779eea48b2aa2d52 +RMD160 (rustc-1.29.0-src.tar.gz) = dd4c8d48f7c66f861a0befcea97ba2884e50ab3f +SHA512 (rustc-1.29.0-src.tar.gz) = 3c6b79cce5a42553bc4360591c6e6b42b36f035243b8cb688a0d4b08c10793e59d257bf9e781c9345c92f765a63a9e161e3e3346f02ddc733e4b401cb5aeb302 +Size (rustc-1.29.0-src.tar.gz) = 106092915 bytes +SHA1 (patch-src_bootstrap_bin_rustc.rs) = 0abf893090a6053e01fd658096d9a2b5b8c144da SHA1 (patch-src_bootstrap_lib.rs) = d86e173b931099730a4f18d044d7977c89f87b91 SHA1 (patch-src_libbacktrace_configure) = b2c1e9b93a99408aad42ab9f1af27704cc81bdd8 -SHA1 (patch-src_liblibc_src_unix_solaris_mod.rs) = 0d17d0b53963cb551ff0bdddb628669458907a24 +SHA1 (patch-src_liblibc_src_unix_solaris_mod.rs) = aeb7c22995e33c700ce3ea4336368a1fd08120e1 SHA1 (patch-src_libstd_build.rs) = 32dad8a474300f9f37bce8b92acca762cf8cc4ab SHA1 (patch-src_libstd_sys_unix_thread.rs) = 46ef46365658e2f895bd3dde9c74f352890e9ccc SHA1 (patch-src_llvm_CMakeLists.txt) = ffdf4337fdc84d8314c97c4e492e6b84244a99d1 -SHA1 (patch-src_llvm_cmake_modules_AddLLVM.cmake) = 282d97cce8d01cfefe565185d4999c2db9ccc13f -SHA1 (patch-src_llvm_include_llvm_Support_DataTypes.h.cmake) = 61cba4480d97e740d361708eb8e5c9b13bb2d36e +SHA1 (patch-src_llvm_cmake_modules_AddLLVM.cmake) = 166af9a52d4863b6d99f37b3cce7c154625f2a8b +SHA1 (patch-src_llvm_include_llvm-c_DataTypes.h) = 432693204912e79059ee31e815ad1e24f3236374 +SHA1 (patch-src_llvm_include_llvm_Analysis_ConstantFolding.h) = 861089ea7ec8985b9b9fce53ffadfa3e9eed4a72 SHA1 (patch-src_vendor_libc_src_unix_solaris_mod.rs) = 785263f25535c6644a674ca931e2591938b2d2f6 diff --git a/lang/rust/patches/patch-src_bootstrap_bin_rustc.rs b/lang/rust/patches/patch-src_bootstrap_bin_rustc.rs index 304cff5b4c6..6fe4600c4dc 100644 --- a/lang/rust/patches/patch-src_bootstrap_bin_rustc.rs +++ b/lang/rust/patches/patch-src_bootstrap_bin_rustc.rs @@ -1,10 +1,10 @@ -$NetBSD: patch-src_bootstrap_bin_rustc.rs,v 1.3 2018/05/18 12:45:52 ryoon Exp $ +$NetBSD: patch-src_bootstrap_bin_rustc.rs,v 1.4 2018/09/14 10:04:43 jperkin Exp $ * Set RPATH for pkgsrc wrapper ---- src/bootstrap/bin/rustc.rs.orig 2018-05-07 17:31:28.000000000 +0000 +--- src/bootstrap/bin/rustc.rs.orig 2018-09-11 03:37:38.000000000 +0000 +++ src/bootstrap/bin/rustc.rs -@@ -226,7 +226,7 @@ fn main() { +@@ -233,7 +233,7 @@ fn main() { cmd.arg("-Z").arg("osx-rpath-install-name"); Some("-Wl,-rpath,@loader_path/../lib") } else if !target.contains("windows") && !target.contains("wasm32") { diff --git a/lang/rust/patches/patch-src_liblibc_src_unix_solaris_mod.rs b/lang/rust/patches/patch-src_liblibc_src_unix_solaris_mod.rs index 61b5ba48a66..8c28c9a045a 100644 --- a/lang/rust/patches/patch-src_liblibc_src_unix_solaris_mod.rs +++ b/lang/rust/patches/patch-src_liblibc_src_unix_solaris_mod.rs @@ -1,8 +1,8 @@ -$NetBSD: patch-src_liblibc_src_unix_solaris_mod.rs,v 1.3 2018/08/09 17:04:03 jperkin Exp $ +$NetBSD: patch-src_liblibc_src_unix_solaris_mod.rs,v 1.4 2018/09/14 10:04:43 jperkin Exp $ Add temporary upstream fixes for SunOS. ---- src/liblibc/src/unix/solaris/mod.rs.orig 2018-07-30 22:16:16.000000000 +0000 +--- src/liblibc/src/unix/solaris/mod.rs.orig 2018-09-11 03:38:01.000000000 +0000 +++ src/liblibc/src/unix/solaris/mod.rs @@ -692,6 +692,8 @@ pub const EOWNERDEAD: ::c_int = 58; pub const ENOTRECOVERABLE: ::c_int = 59; @@ -13,12 +13,3 @@ Add temporary upstream fixes for SunOS. pub const ETIME: ::c_int = 62; pub const ENOSR: ::c_int = 63; pub const ENONET: ::c_int = 64; -@@ -1208,7 +1210,7 @@ pub const EPOLLET: ::c_int = 0x80000000; - pub const EPOLLRDHUP: ::c_int = 0x2000; - pub const EPOLLEXCLUSIVE: ::c_int = 0x10000000; - pub const EPOLLONESHOT: ::c_int = 0x40000000; --pub const EPOLL_CLOEXEC: ::c_int = 0x02000000; -+pub const EPOLL_CLOEXEC: ::c_int = 0x80000; - pub const EPOLL_CTL_ADD: ::c_int = 1; - pub const EPOLL_CTL_MOD: ::c_int = 3; - pub const EPOLL_CTL_DEL: ::c_int = 2; diff --git a/lang/rust/patches/patch-src_llvm_cmake_modules_AddLLVM.cmake b/lang/rust/patches/patch-src_llvm_cmake_modules_AddLLVM.cmake index c9ebc4d27c3..78e8597aa85 100644 --- a/lang/rust/patches/patch-src_llvm_cmake_modules_AddLLVM.cmake +++ b/lang/rust/patches/patch-src_llvm_cmake_modules_AddLLVM.cmake @@ -1,15 +1,15 @@ -$NetBSD: patch-src_llvm_cmake_modules_AddLLVM.cmake,v 1.1 2016/09/06 10:36:49 jperkin Exp $ +$NetBSD: patch-src_llvm_cmake_modules_AddLLVM.cmake,v 1.2 2018/09/14 10:04:43 jperkin Exp $ "-z discard-unused" is only supported by Oracle Solaris ld. ---- src/llvm/cmake/modules/AddLLVM.cmake.orig 2016-08-16 01:55:49.000000000 +0000 +--- src/llvm/cmake/modules/AddLLVM.cmake.orig 2018-08-01 16:32:37.000000000 +0000 +++ src/llvm/cmake/modules/AddLLVM.cmake -@@ -175,8 +175,6 @@ function(add_link_opts target_name) +@@ -219,8 +219,6 @@ function(add_link_opts target_name) set_property(TARGET ${target_name} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-dead_strip") elseif(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") - set_property(TARGET ${target_name} APPEND_STRING PROPERTY - LINK_FLAGS " -Wl,-z -Wl,discard-unused=sections") - elseif(NOT WIN32 AND NOT LLVM_LINKER_IS_GOLD) + elseif(NOT WIN32 AND NOT LLVM_LINKER_IS_GOLD AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") # Object files are compiled with -ffunction-data-sections. # Versions of bfd ld < 2.23.1 have a bug in --gc-sections that breaks diff --git a/lang/rust/patches/patch-src_llvm_include_llvm_Support_DataTypes.h.cmake b/lang/rust/patches/patch-src_llvm_include_llvm-c_DataTypes.h index f87cf91849d..7f7669f4a02 100644 --- a/lang/rust/patches/patch-src_llvm_include_llvm_Support_DataTypes.h.cmake +++ b/lang/rust/patches/patch-src_llvm_include_llvm-c_DataTypes.h @@ -1,10 +1,10 @@ -$NetBSD: patch-src_llvm_include_llvm_Support_DataTypes.h.cmake,v 1.1 2018/06/21 17:13:13 jperkin Exp $ +$NetBSD: patch-src_llvm_include_llvm-c_DataTypes.h,v 1.1 2018/09/14 10:04:43 jperkin Exp $ Don't implement sys/regset.h workaround, fix source instead. ---- src/llvm/include/llvm/Support/DataTypes.h.cmake.orig 2018-03-10 02:51:13.000000000 +0000 -+++ src/llvm/include/llvm/Support/DataTypes.h.cmake -@@ -132,4 +132,27 @@ typedef signed int ssize_t; +--- src/llvm/include/llvm-c/DataTypes.h.orig 2018-08-01 16:32:37.000000000 +0000 ++++ src/llvm/include/llvm-c/DataTypes.h +@@ -87,4 +87,27 @@ typedef signed int ssize_t; #define HUGE_VALF (float)HUGE_VAL #endif @@ -31,4 +31,4 @@ Don't implement sys/regset.h workaround, fix source instead. +#undef TRAPNO +#endif + - #endif /* SUPPORT_DATATYPES_H */ + #endif /* LLVM_C_DATATYPES_H */ diff --git a/lang/rust/patches/patch-src_llvm_include_llvm_Analysis_ConstantFolding.h b/lang/rust/patches/patch-src_llvm_include_llvm_Analysis_ConstantFolding.h new file mode 100644 index 00000000000..493b8d58262 --- /dev/null +++ b/lang/rust/patches/patch-src_llvm_include_llvm_Analysis_ConstantFolding.h @@ -0,0 +1,17 @@ +$NetBSD: patch-src_llvm_include_llvm_Analysis_ConstantFolding.h,v 1.1 2018/09/14 10:04:43 jperkin Exp $ + +Fix SunOS CS conflict not handled by include/llvm-c/DataTypes.h + +--- src/llvm/include/llvm/Analysis/ConstantFolding.h.orig 2018-08-01 16:32:37.000000000 +0000 ++++ src/llvm/include/llvm/Analysis/ConstantFolding.h +@@ -20,6 +20,10 @@ + #ifndef LLVM_ANALYSIS_CONSTANTFOLDING_H + #define LLVM_ANALYSIS_CONSTANTFOLDING_H + ++#ifdef __sun ++#undef CS ++#endif ++ + namespace llvm { + class APInt; + template <typename T> class ArrayRef; |