Received: by mail.netbsd.org (Postfix, from userid 605) id 078F084D80; Fri, 2 Mar 2018 05:59:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7A55484D4D for ; Fri, 2 Mar 2018 05:59:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id wET5P4sZedLF for ; Fri, 2 Mar 2018 05:59:29 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 9AB4684CEF for ; Fri, 2 Mar 2018 05:59:29 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C6281FB40; Fri, 2 Mar 2018 05:59:18 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1519970358152060" MIME-Version: 1.0 Date: Fri, 2 Mar 2018 05:59:18 +0000 From: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= Subject: CVS commit: pkgsrc/lang/rust To: pkgsrc-changes@NetBSD.org Reply-To: triaxx@netbsd.org X-Mailer: log_accum Message-Id: <20180302055918.C6281FB40@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. --_----------=_1519970358152060 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: triaxx Date: Fri Mar 2 05:59:18 UTC 2018 Modified Files: pkgsrc/lang/rust: Makefile distinfo pkgsrc/lang/rust/patches: patch-src_bootstrap_lib.rs Log Message: Enable FreeBSD support To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 pkgsrc/lang/rust/Makefile cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/rust/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/rust/patches/patch-src_bootstrap_lib.rs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1519970358152060 Content-Disposition: inline Content-Length: 9481 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.29 pkgsrc/lang/rust/Makefile:1.30 --- pkgsrc/lang/rust/Makefile:1.29 Sun Feb 18 12:12:54 2018 +++ pkgsrc/lang/rust/Makefile Fri Mar 2 05:59:18 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2018/02/18 12:12:54 ryoon Exp $ +# $NetBSD: Makefile,v 1.30 2018/03/02 05:59:18 triaxx Exp $ DISTNAME= rustc-1.24.0-src PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} @@ -107,6 +107,18 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} #DISTFILES:= ${DISTFILES} ${RUST_STAGE0} #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:= 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} +.endif +.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) +RUST_ARCH:= x86_64-unknown-freebsd +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} +.endif .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi) RUST_ARCH= i686-unknown-netbsd RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz @@ -165,6 +177,10 @@ LD_LIBRARY_PATH= ${RUST_BOOTSTRAP_PATH}/ PKGSRC_MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH:Q} .endif +.if ${OPSYS} == "FreeBSD" +MAKE_ENV+= OPENSSL_DIR=${SSLBASE} +.endif + do-build: cd ${WRKSRC} \ && env ${MAKE_ENV} \ Index: pkgsrc/lang/rust/distinfo diff -u pkgsrc/lang/rust/distinfo:1.18 pkgsrc/lang/rust/distinfo:1.19 --- pkgsrc/lang/rust/distinfo:1.18 Sun Feb 18 12:12:54 2018 +++ pkgsrc/lang/rust/distinfo Fri Mar 2 05:59:18 2018 @@ -1,9 +1,13 @@ -$NetBSD: distinfo,v 1.18 2018/02/18 12:12:54 ryoon Exp $ +$NetBSD: distinfo,v 1.19 2018/03/02 05:59:18 triaxx Exp $ SHA1 (rust-1.23.0-i686-apple-darwin.tar.gz) = 3d22c63d17a94beaec6b36866c8919674158c0f7 RMD160 (rust-1.23.0-i686-apple-darwin.tar.gz) = 53111ab85eab609293a975bb02efa149c4e4cd93 SHA512 (rust-1.23.0-i686-apple-darwin.tar.gz) = 0c3b16a2b7678a37ab5663fd643f53de182fafc39c892533377deb9736a13beadf12930d8dacb60957d8470058027e7d83787df3c4c21813bf7404daf7ba99c8 Size (rust-1.23.0-i686-apple-darwin.tar.gz) = 142608015 bytes +SHA1 (rust-1.23.0-i686-unknown-freebsd.tar.gz) = e3aef3ab7c25756024da4c7eeab0c46ada0a0aa6 +RMD160 (rust-1.23.0-i686-unknown-freebsd.tar.gz) = d2b43748ebae3643c01aaeb6229a5bf2cf9b5a47 +SHA512 (rust-1.23.0-i686-unknown-freebsd.tar.gz) = 1039b754de0462c943431f5dacedad9f0235d75f38d1bcb685fbd8ba9e3c7798ec742097fd5750e4d2e787ef438a762e7b2c5ea7a1f3848cc33a460c398dbcef +Size (rust-1.23.0-i686-unknown-freebsd.tar.gz) = 185608141 bytes SHA1 (rust-1.23.0-i686-unknown-linux-gnu.tar.gz) = d8f7042750254fff622c00c13954321828cd0ced RMD160 (rust-1.23.0-i686-unknown-linux-gnu.tar.gz) = f04d4d27384e5152461319bb1e73788102a0b410 SHA512 (rust-1.23.0-i686-unknown-linux-gnu.tar.gz) = b4b5a26b6416ceb81cbb7202c42481bfa10ef2afabfa46c2eefc89d58f87b1b4785c1f65e2f58ea863ae3d3e794aa06e101f9097d5aa757e6749d891006a7542 @@ -16,6 +20,10 @@ SHA1 (rust-1.23.0-x86_64-apple-darwin.ta RMD160 (rust-1.23.0-x86_64-apple-darwin.tar.gz) = 54b285b7681cb8fc419c506da8654e977ae09425 SHA512 (rust-1.23.0-x86_64-apple-darwin.tar.gz) = 8aa6351ab3d41ef203e98cc3d24c0b80a19c43a2905bbb27516ff23f2bb6127ece44d9fdd69ad07e81c435f04c6848427f7b5dafc10ea92d89a6a4ffa8dca04a Size (rust-1.23.0-x86_64-apple-darwin.tar.gz) = 145099760 bytes +SHA1 (rust-1.23.0-x86_64-unknown-freebsd.tar.gz) = 4aa3acfce0e30b54a4d07444ef927cd5a983ac0f +RMD160 (rust-1.23.0-x86_64-unknown-freebsd.tar.gz) = df9f904e587bddae2c0c625efac1afb8d8576746 +SHA512 (rust-1.23.0-x86_64-unknown-freebsd.tar.gz) = 8a67fb4fd7e75860da443dca67c250709a134cd37eb79716fd99c1a44602d50d7202d0b5609365848bf689375e39e4b35afed9d246afcdbf20316b8636b0fdb3 +Size (rust-1.23.0-x86_64-unknown-freebsd.tar.gz) = 180539819 bytes SHA1 (rust-1.23.0-x86_64-unknown-linux-gnu.tar.gz) = 3e068b6aef53a27adc5445f5a5332402ebcc2843 RMD160 (rust-1.23.0-x86_64-unknown-linux-gnu.tar.gz) = 6bd32b76d29474bf0a4d688e6de983815006d19d SHA512 (rust-1.23.0-x86_64-unknown-linux-gnu.tar.gz) = 71c0a893b25f6498bfd73104f006b79b5d6a31e4a4bcc6dcbe1b48183120afca28c12404b436417e010e3c449845c98e27e76d2b0f33498bcb35d2434b1fa821 @@ -28,6 +36,10 @@ SHA1 (rust-std-1.23.0-i686-apple-darwin. RMD160 (rust-std-1.23.0-i686-apple-darwin.tar.gz) = 2873bd63f74c1d225a0a3392bb8cfa5534679dc1 SHA512 (rust-std-1.23.0-i686-apple-darwin.tar.gz) = fb5f23f1cc2a25b63585713fb6cc6b4709438223609c43d877da063d2eafe71855c7ef7d5a715920523503cbdabf6077b3bf15620373516151d4914c396850da Size (rust-std-1.23.0-i686-apple-darwin.tar.gz) = 66640892 bytes +SHA1 (rust-std-1.23.0-i686-unknown-freebsd.tar.gz) = 132562542e4944971c85ccc8315e742beadcf0a4 +RMD160 (rust-std-1.23.0-i686-unknown-freebsd.tar.gz) = e3110aa1a31e6a2e1a4e3041e3333d152f7d0cf9 +SHA512 (rust-std-1.23.0-i686-unknown-freebsd.tar.gz) = f542a62ab6c0f593aa430a44a50239e04bc08a2d1692802f7b9a74b632cd1d62f14e88d9a3a2610b25343bd462e8a1d07fd67d617122841d376cc1e57598adbf +Size (rust-std-1.23.0-i686-unknown-freebsd.tar.gz) = 85554022 bytes SHA1 (rust-std-1.23.0-i686-unknown-linux-gnu.tar.gz) = a28b66f18472d47597da157e21ac4a1bda0eb03e RMD160 (rust-std-1.23.0-i686-unknown-linux-gnu.tar.gz) = 1e2f58f04855fce5c2dcddc818361996ad2f3692 SHA512 (rust-std-1.23.0-i686-unknown-linux-gnu.tar.gz) = 2c36e7ccc3374063d20ebe43fc1e3e3f666725aa4427a2f6e8348e7468e53414abd1ecacc82b72374b33bab0b13248f19396ea9ef84235c5e2c6cf3c3effbcff @@ -40,6 +52,10 @@ SHA1 (rust-std-1.23.0-x86_64-apple-darwi RMD160 (rust-std-1.23.0-x86_64-apple-darwin.tar.gz) = 5b2d5f9e7ed73112fc970d5d74eef392b5c490a8 SHA512 (rust-std-1.23.0-x86_64-apple-darwin.tar.gz) = 25db3f206174b6ba169646faa02bf305ed9efe1ef7bebbb74ebc6feb9ed293e4db9a1107baa10fc4b51d48046759fc459ebdf1c7fa3fb50f5bc0b4a5d5a22575 Size (rust-std-1.23.0-x86_64-apple-darwin.tar.gz) = 67553850 bytes +SHA1 (rust-std-1.23.0-x86_64-unknown-freebsd.tar.gz) = f658c1f37a8e6eddf0b93b020a70c755e15b62ae +RMD160 (rust-std-1.23.0-x86_64-unknown-freebsd.tar.gz) = dd2f5a835458041b9119512927fd0d7b29db7f1b +SHA512 (rust-std-1.23.0-x86_64-unknown-freebsd.tar.gz) = 6b4717e2a2033b83fd171e5966a0a91fb25c1e59460e73536cb903a7175193855fb301a4e62d53a886a8cdd734e862ddd4ac96e92b46a0c57973dad277aa76ab +Size (rust-std-1.23.0-x86_64-unknown-freebsd.tar.gz) = 83513873 bytes SHA1 (rust-std-1.23.0-x86_64-unknown-linux-gnu.tar.gz) = 200d5e19bb178beb0ad7a2a7068693d3b0e6ddae RMD160 (rust-std-1.23.0-x86_64-unknown-linux-gnu.tar.gz) = 4c8ef656997e4bb0dbb9d4927d0f9f876c88b4cb SHA512 (rust-std-1.23.0-x86_64-unknown-linux-gnu.tar.gz) = f1dba207b62306e8a15573020088e87ae5d1b53fc081d92439c93add82751ac9aaa265e073ee7240185310aa533bac6f3fc354486af429d29332074eaf80a877 @@ -53,7 +69,7 @@ RMD160 (rustc-1.24.0-src.tar.gz) = 5ba75 SHA512 (rustc-1.24.0-src.tar.gz) = c879547bef9cd1b0ed1055cc0198fc79d16689a2ed24e783990b5626863a8e9953403470dfad0a18ea7cddea82f837f3e29cd155b155aa2bf3fd1328fc98e622 Size (rustc-1.24.0-src.tar.gz) = 67506894 bytes SHA1 (patch-src_bootstrap_bin_rustc.rs) = e4baa9e42a8d1e55fdf8317f833d5b645dd6e1c2 -SHA1 (patch-src_bootstrap_lib.rs) = 1c290a1e0f251c99cdb4fa8639f8680f9c7953ff +SHA1 (patch-src_bootstrap_lib.rs) = d86e173b931099730a4f18d044d7977c89f87b91 SHA1 (patch-src_libbacktrace_configure) = b2c1e9b93a99408aad42ab9f1af27704cc81bdd8 SHA1 (patch-src_libstd_build.rs) = 32dad8a474300f9f37bce8b92acca762cf8cc4ab SHA1 (patch-src_llvm_cmake_modules_AddLLVM.cmake) = 282d97cce8d01cfefe565185d4999c2db9ccc13f Index: pkgsrc/lang/rust/patches/patch-src_bootstrap_lib.rs diff -u pkgsrc/lang/rust/patches/patch-src_bootstrap_lib.rs:1.2 pkgsrc/lang/rust/patches/patch-src_bootstrap_lib.rs:1.3 --- pkgsrc/lang/rust/patches/patch-src_bootstrap_lib.rs:1.2 Mon Jan 8 09:33:58 2018 +++ pkgsrc/lang/rust/patches/patch-src_bootstrap_lib.rs Fri Mar 2 05:59:18 2018 @@ -1,10 +1,11 @@ -$NetBSD: patch-src_bootstrap_lib.rs,v 1.2 2018/01/08 09:33:58 ryoon Exp $ +$NetBSD: patch-src_bootstrap_lib.rs,v 1.3 2018/03/02 05:59:18 triaxx Exp $ Don't filter out optimization flags. +FreeBSD has a particular C++ runtime library name ---- src/bootstrap/lib.rs.orig 2018-01-01 21:50:13.000000000 +0000 +--- src/bootstrap/lib.rs.orig 2018-02-12 18:51:18.000000000 +0000 +++ src/bootstrap/lib.rs -@@ -636,7 +636,6 @@ impl Build { +@@ -632,7 +632,6 @@ impl Build { // cc-rs because the build scripts will determine that for themselves. let mut base = self.cc[&target].args().iter() .map(|s| s.to_string_lossy().into_owned()) @@ -12,3 +13,15 @@ Don't filter out optimization flags. .collect::>(); // If we're compiling on macOS then we add a few unconditional flags +@@ -643,6 +642,11 @@ impl Build { + base.push("-stdlib=libc++".into()); + } + ++ // FreeBSD (from 10.2) also uses libc++. ++ if target.contains("freebsd") { ++ base.push("-stdlib=libc++".into()); ++ } ++ + // Work around an apparently bad MinGW / GCC optimization, + // See: http://lists.llvm.org/pipermail/cfe-dev/2016-December/051980.html + // See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78936 --_----------=_1519970358152060--