Received: by mail.netbsd.org (Postfix, from userid 605) id D9FC584D81; Sun, 28 Oct 2018 13:21:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E99B984D6E for ; Sun, 28 Oct 2018 13:21:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id SJ892bMau2cu for ; Sun, 28 Oct 2018 13:21:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5984284CCF for ; Sun, 28 Oct 2018 13:21:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 55FDFFBEE; Sun, 28 Oct 2018 13:21:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_154073289663200" MIME-Version: 1.0 Date: Sun, 28 Oct 2018 13:21:36 +0000 From: "Havard Eidnes" Subject: CVS commit: pkgsrc/lang/rust To: pkgsrc-changes@NetBSD.org Reply-To: he@netbsd.org X-Mailer: log_accum Message-Id: <20181028132136.55FDFFBEE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_154073289663200 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: he Date: Sun Oct 28 13:21:36 UTC 2018 Modified Files: pkgsrc/lang/rust: Makefile distinfo pkgsrc/lang/rust/files: gcc-wrap Removed Files: pkgsrc/lang/rust/patches: patch-src_vendor_libc_src_unix_solaris_mod.rs Log Message: Upgrade rust to version 1.29.2. Upstream changes: * Workaround for an aliasing-related LLVM bug, which caused miscompilation. * The rls-preview component on the windows-gnu targets has been restored. Pkgsrc changes: * More commented-out settings for cross builds on NetBSD. * Bump bootstrap kit versions to 1.29.2 for powerpc, sparc64 and earm7hf. Anyone up for testing for earm7hf? * Because the built-in versions of libgit2, libssh2 and curl can no longer be built with the pkgsrc-provided headers for those packages (due to version skew; the built-in versions have been updated to un-released newer code), the buildlink3.mk files for those packages have been commented out. * Similarly, to avoid using the native pkgsrc host's headers when cross- building, the gcc-wrap script has been adjusted to also re-point /usr/pkg/include into the destination's root (where those above pacakges are not to be installed). * Also have the gcc-wrap script deal with "-I dir" style directives, and re-point these also into the destination's root. * One patch has been integrated upstream, so removed here. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 pkgsrc/lang/rust/Makefile cvs rdiff -u -r1.41 -r1.42 pkgsrc/lang/rust/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/rust/files/gcc-wrap cvs rdiff -u -r1.2 -r0 \ pkgsrc/lang/rust/patches/patch-src_vendor_libc_src_unix_solaris_mod.rs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_154073289663200 Content-Disposition: inline Content-Length: 14247 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/rust/Makefile diff -u pkgsrc/lang/rust/Makefile:1.61 pkgsrc/lang/rust/Makefile:1.62 --- pkgsrc/lang/rust/Makefile:1.61 Thu Oct 18 15:35:49 2018 +++ pkgsrc/lang/rust/Makefile Sun Oct 28 13:21:36 2018 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.61 2018/10/18 15:35:49 he Exp $ +# $NetBSD: Makefile,v 1.62 2018/10/28 13:21:36 he Exp $ -DISTNAME= rustc-1.29.1-src +DISTNAME= rustc-1.29.2-src PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} -PKGREVISION= 2 +#PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/ @@ -38,10 +38,14 @@ CONFIGURE_ARGS.SunOS+= --disable-jemallo # to do a cross-build. The wrapper script assumes dest/ and tools/ # as a result of a cross-build as subdirectories of this root #CROSS_ROOT= /u/evbarm-armv7hf +#CROSS_ROOT= /u/sparc64 +#CROSS_ROOT= /u/macppc #MAKE_ENV+= CROSS_ROOT=${CROSS_ROOT} # The GNU cross target designation #GNU_CROSS_TARGET= armv7--netbsdelf-eabihf +#GNU_CROSS_TARGET= sparc64--netbsd +#GNU_CROSS_TARGET= powerpc--netbsd #MAKE_ENV+= GNU_CROSS_TARGET=${GNU_CROSS_TARGET} # To cross-build rust, you need to specify @@ -49,6 +53,8 @@ CONFIGURE_ARGS.SunOS+= --disable-jemallo # host the compiler is supposed to run on. # Rust's target designation #TARGET= armv7-unknown-netbsd-eabihf +#TARGET= sparc64-unknown-netbsd +#TARGET= powerpc-unknown-netbsd #SCRIPTS= ${WRKDIR}/scripts #CONFIGURE_ARGS+= --host=${TARGET} #CONFIGURE_ARGS+= --target=${TARGET} @@ -191,7 +197,7 @@ pre-build-fix: .endif .if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make (makesum) || make(mdi) RUST_ARCH= powerpc-unknown-netbsd -RUST_STAGE0_VER= 1.28.0 +RUST_STAGE0_VER= 1.29.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} @@ -202,7 +208,7 @@ pre-build-fix: .endif .if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make (makesum) || make(mdi) RUST_ARCH= sparc64-unknown-netbsd -RUST_STAGE0_VER= 1.29.1 +RUST_STAGE0_VER= 1.29.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} @@ -213,7 +219,7 @@ pre-build-fix: .endif .if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi) RUST_ARCH= armv7-unknown-netbsd-eabihf -RUST_STAGE0_VER= 1.29.1 +RUST_STAGE0_VER= 1.29.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} @@ -402,11 +408,11 @@ stage0-bootstrap: install .endif .include "../../devel/cmake/buildlink3.mk" -.include "../../devel/libgit2/buildlink3.mk" +#.include "../../devel/libgit2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../lang/python/tool.mk" -.include "../../security/libssh2/buildlink3.mk" +#.include "../../security/libssh2/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" -.include "../../www/curl/buildlink3.mk" +#.include "../../www/curl/buildlink3.mk" .include "../../www/http-parser/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/lang/rust/distinfo diff -u pkgsrc/lang/rust/distinfo:1.41 pkgsrc/lang/rust/distinfo:1.42 --- pkgsrc/lang/rust/distinfo:1.41 Mon Oct 15 11:22:23 2018 +++ pkgsrc/lang/rust/distinfo Sun Oct 28 13:21:36 2018 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.41 2018/10/15 11:22:23 he Exp $ +$NetBSD: distinfo,v 1.42 2018/10/28 13:21:36 he Exp $ SHA1 (rust-1.28.0-i686-apple-darwin.tar.gz) = 85d947b4d260361f63f77e1f4921ac89bd849d78 RMD160 (rust-1.28.0-i686-apple-darwin.tar.gz) = 963abf1b0b5e2673c8e2d6c1b4d5a2d8ed9d8d2f @@ -16,10 +16,6 @@ SHA1 (rust-1.28.0-i686-unknown-netbsd.ta 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-powerpc-unknown-netbsd.tar.gz) = 0e3e5be17acc8b088c2716e6d47ef6a51069fdde -RMD160 (rust-1.28.0-powerpc-unknown-netbsd.tar.gz) = 848a243fa072eaf475583d8575d5457e66854c19 -SHA512 (rust-1.28.0-powerpc-unknown-netbsd.tar.gz) = 054837b5ddb0ec598d84336d4c257a430e8c096447c51e5e08b418d7a97f8ca5280998175f205cb2d901e7b92026c31ba3b972a0534f47eecd6d4aa0542a9655 -Size (rust-1.28.0-powerpc-unknown-netbsd.tar.gz) = 192518386 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 @@ -40,14 +36,18 @@ SHA1 (rust-1.28.0-x86_64-unknown-netbsd. 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-1.29.1-armv7-unknown-netbsd-eabihf.tar.gz) = 343f1d41945b15402199377188f19313054bc62f -RMD160 (rust-1.29.1-armv7-unknown-netbsd-eabihf.tar.gz) = ec1262a66a934b2933197324d27eff5fb960c416 -SHA512 (rust-1.29.1-armv7-unknown-netbsd-eabihf.tar.gz) = a4c2f52d8c738f6c53a6bcc636f59d4dad0b8c6ea73d6c452ea271d7ebbed2e7f7b31d07d67e0f123ce11a42c8fbc8ce28674f86a2f3a5db5ff57441f7cb4cf0 -Size (rust-1.29.1-armv7-unknown-netbsd-eabihf.tar.gz) = 205073438 bytes -SHA1 (rust-1.29.1-sparc64-unknown-netbsd.tar.gz) = 8704deed839a9f14570bbbc6a865c75e9f428fb1 -RMD160 (rust-1.29.1-sparc64-unknown-netbsd.tar.gz) = 9547f8ec7058f6eacdb9cfd27e7f67a20225c331 -SHA512 (rust-1.29.1-sparc64-unknown-netbsd.tar.gz) = a2f89cb6274cebf1cd58b8cbd51ed4fe081fee4bb52263573a7d824aa7ddb6c381bb309a76e2bf4d61db64539c43c02479a8526655c2b72ee1cb087e49e9af57 -Size (rust-1.29.1-sparc64-unknown-netbsd.tar.gz) = 206363768 bytes +SHA1 (rust-1.29.2-armv7-unknown-netbsd-eabihf.tar.gz) = cf70e101a6d8ae2bf9034d7e61510d333dc8fd9b +RMD160 (rust-1.29.2-armv7-unknown-netbsd-eabihf.tar.gz) = abca0a9254462b3091af857826bf6354be6ec54e +SHA512 (rust-1.29.2-armv7-unknown-netbsd-eabihf.tar.gz) = 3c60c67e8ad8122b05255a267dfed4a0556aa1298a0a864bb4e2a8f1f346a52a75e9dd11408ba7cc78e4cc2bdba35291128441eac4720ac2f6dc9a40c6e3c5f2 +Size (rust-1.29.2-armv7-unknown-netbsd-eabihf.tar.gz) = 204812330 bytes +SHA1 (rust-1.29.2-powerpc-unknown-netbsd.tar.gz) = cef9bb2964b3c67cadbedc255f6219d08771e6f6 +RMD160 (rust-1.29.2-powerpc-unknown-netbsd.tar.gz) = 7f4bf34abbe482c9d31fb205437dd4488252eecc +SHA512 (rust-1.29.2-powerpc-unknown-netbsd.tar.gz) = 78d3cbe6733b6e150c159b8977735c9e7aae79c4ab6107144d17bb2bd7b63c6984087dd43bc551a299cdc70f68b5eecad24d1c4581c1a9650cb5a24ad23c56e9 +Size (rust-1.29.2-powerpc-unknown-netbsd.tar.gz) = 197582833 bytes +SHA1 (rust-1.29.2-sparc64-unknown-netbsd.tar.gz) = 3b68194d4a9cdb012946166bd5b491969528c2f5 +RMD160 (rust-1.29.2-sparc64-unknown-netbsd.tar.gz) = e88cbdd535830a11fdf0d9c559a844cfc79b3b40 +SHA512 (rust-1.29.2-sparc64-unknown-netbsd.tar.gz) = 234fdf775ee5d0ee0d39193324fcc6b7ba4f9f0b97f3b1fa061f3ef23a7852fb6f6a4977e29bd8eb7d56042fd5ef3bd03789283d7ca13c4397ba603f69b1eae6 +Size (rust-1.29.2-sparc64-unknown-netbsd.tar.gz) = 206018883 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 @@ -64,10 +64,6 @@ SHA1 (rust-std-1.28.0-i686-unknown-netbs 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-powerpc-unknown-netbsd.tar.gz) = 2eb760731636e19094d36aae84fca72094e1600a -RMD160 (rust-std-1.28.0-powerpc-unknown-netbsd.tar.gz) = aa764f9cc59dd256718e17d5683bbc7e14657a75 -SHA512 (rust-std-1.28.0-powerpc-unknown-netbsd.tar.gz) = 265e71e390689a6e7624e3378fae767c22225bcbc03ad5fb84b91b48c53c3d364a3dc8bdcf11028aa618f0d11d126220911bb17e5c91f38361548e7673d37718 -Size (rust-std-1.28.0-powerpc-unknown-netbsd.tar.gz) = 66023865 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 @@ -84,18 +80,22 @@ SHA1 (rust-std-1.28.0-x86_64-unknown-net 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 (rust-std-1.29.1-armv7-unknown-netbsd-eabihf.tar.gz) = abfe723d6d8708a88bbc5383f9c9f6e6a2a1a73e -RMD160 (rust-std-1.29.1-armv7-unknown-netbsd-eabihf.tar.gz) = 84260b756be013b7783fffc6b403650e3e34f266 -SHA512 (rust-std-1.29.1-armv7-unknown-netbsd-eabihf.tar.gz) = b57acb2fee5c0563be75bfad4c824035684baaaf6c8242334ccc77d39b84886eb91014b846b451f7f4a685b1c956fb41d6a8b338e44138d61b6899a454876bc6 -Size (rust-std-1.29.1-armv7-unknown-netbsd-eabihf.tar.gz) = 67472170 bytes -SHA1 (rust-std-1.29.1-sparc64-unknown-netbsd.tar.gz) = 634c1bc68cc4adf26b76972c7c30aab0a44016ba -RMD160 (rust-std-1.29.1-sparc64-unknown-netbsd.tar.gz) = 2394669652ff61981cb21e0ce02ceae14be19c1c -SHA512 (rust-std-1.29.1-sparc64-unknown-netbsd.tar.gz) = 6930bfc7f14772f1942d4168e88ba3b97028c4cc65bed5767983019c81e4df15fd214eb7ac2397fd88571f5af599d86c74a276fa3cedba131632efc1b50badf4 -Size (rust-std-1.29.1-sparc64-unknown-netbsd.tar.gz) = 67594821 bytes -SHA1 (rustc-1.29.1-src.tar.gz) = 5b1cc48bda7d77137062908def9b3f428dc3996d -RMD160 (rustc-1.29.1-src.tar.gz) = 780a25bb9c8fd60cde53ce617a0065362337d6ad -SHA512 (rustc-1.29.1-src.tar.gz) = 3151c398a79169af7dd0735d5115112cb64858120a637eda018cb4544dd9988f7540120cc0122d2af7348968285650d8605837e9f40337ec95e549d5e8763f04 -Size (rustc-1.29.1-src.tar.gz) = 106095241 bytes +SHA1 (rust-std-1.29.2-armv7-unknown-netbsd-eabihf.tar.gz) = f8c582a5e1d46e79c3ac5ff92f0276cec4f0a683 +RMD160 (rust-std-1.29.2-armv7-unknown-netbsd-eabihf.tar.gz) = f1e8784c0248e29762dc6eee87abf453c328387d +SHA512 (rust-std-1.29.2-armv7-unknown-netbsd-eabihf.tar.gz) = b2d3dee987be5e53e23b438cc1995496cd4f8e41defc12f5593a0a7110a979580a7083053838261233d99e80a8714f72e5701149b76fa27402501e70867b0788 +Size (rust-std-1.29.2-armv7-unknown-netbsd-eabihf.tar.gz) = 67066071 bytes +SHA1 (rust-std-1.29.2-powerpc-unknown-netbsd.tar.gz) = 6c4c6a80de89bb49cf16a107cfa72f72251a8b4b +RMD160 (rust-std-1.29.2-powerpc-unknown-netbsd.tar.gz) = c39482b3b02ed7847cc467d330dcd76bff5b5dc4 +SHA512 (rust-std-1.29.2-powerpc-unknown-netbsd.tar.gz) = 983cc506adf0fdff972933840fa52c945976d1a5a4bad7c5ed16f09573a681cf55584d0ef506c2b8cff492232e7044ca6a10694d1120044949d7293393b6ad83 +Size (rust-std-1.29.2-powerpc-unknown-netbsd.tar.gz) = 65214754 bytes +SHA1 (rust-std-1.29.2-sparc64-unknown-netbsd.tar.gz) = 06dff3e98bea005c1c2fb09873dd9e96374826b6 +RMD160 (rust-std-1.29.2-sparc64-unknown-netbsd.tar.gz) = 332fbd5b27a6d8d9f0557b336e696dd99dd3e2b5 +SHA512 (rust-std-1.29.2-sparc64-unknown-netbsd.tar.gz) = 4349bd64a5ed0859240201f11ee3cf2fa19cd71128f66375e8ebbc9cd62a4ab86ca50f342d2cf708a0e7aae5b19d6a3797a2841d42ad648dce15281839c2bc92 +Size (rust-std-1.29.2-sparc64-unknown-netbsd.tar.gz) = 67192130 bytes +SHA1 (rustc-1.29.2-src.tar.gz) = f286ff79eaaa8577f1f0e1cd8dd6a349c15b9484 +RMD160 (rustc-1.29.2-src.tar.gz) = 09aaf28ac12c401653880cbd90041f242e25142b +SHA512 (rustc-1.29.2-src.tar.gz) = c72065d53a401b57818ec7751816095bbb0f31821810010a2c506ab12c2bacd1e0fe9da9b244952d930da3116ac6fab90f9fc240f7ad9c1788dbfd6bfaa8d1be +Size (rustc-1.29.2-src.tar.gz) = 105727098 bytes SHA1 (patch-src_bootstrap_bin_rustc.rs) = 0abf893090a6053e01fd658096d9a2b5b8c144da SHA1 (patch-src_bootstrap_bootstrap.py) = ed0c794ed15454acb3cbb9ede38ed76be35c7ca6 SHA1 (patch-src_bootstrap_lib.rs) = d86e173b931099730a4f18d044d7977c89f87b91 @@ -107,4 +107,3 @@ SHA1 (patch-src_llvm_CMakeLists.txt) = f SHA1 (patch-src_llvm_cmake_modules_AddLLVM.cmake) = f0620ac62ecfb1d62d2dfa61b4c063d21c29b8f5 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 Index: pkgsrc/lang/rust/files/gcc-wrap diff -u pkgsrc/lang/rust/files/gcc-wrap:1.2 pkgsrc/lang/rust/files/gcc-wrap:1.3 --- pkgsrc/lang/rust/files/gcc-wrap:1.2 Mon Oct 15 11:22:23 2018 +++ pkgsrc/lang/rust/files/gcc-wrap Sun Oct 28 13:21:36 2018 @@ -71,6 +71,23 @@ while [ $# -gt 0 ]; do -I/usr/include/krb5) args="$args -I=/usr/include/krb5" ;; + -I/usr/pkg/include) + args="$args -I=/usr/pkg/include" + ;; + -I) + if [ $2 = "/usr/include" ]; then + args="$args -I=/usr/include" + shift + elif [ $2 = "/usr/include/krb5" ]; then + args="$args -I=/usr/include/krb5" + shift + elif [ $2 = "/usr/pkg/include" ]; then + args="$args -I=/usr/pkg/include" + shift + else + args="$args -I" + fi + ;; -l*) if ! $linktweaked; then args="$args $linkadd" --_----------=_154073289663200--