From nobody Thu Aug 25 10:50:30 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MD09f2Sdsz4ZF1l; Thu, 25 Aug 2022 10:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MD09f1yRSz3tL5; Thu, 25 Aug 2022 10:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661424630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w6rEpxI4wZchCjIfd6i4LfVUj0xR188iEyyPhgH0alk=; b=SBte985k7sfBUE0WC1Rc8CWhRy4osKRkeDG9BMc+6KdHqnLzlKndw5OhFRUgm0KgVEnycR FOfd+PhdVfj5Oza8icketuSh//yLcYtaEK3oIC/grDoZxaKjms1Q4VA0qRzeY7r34ABaCN voAJREPdUYWNSxirFZpSyMB8+nm9AKWktn1VRr08zqKAfe2CB7G5pkQLN2RdA1t+zYiOcq r0PQB6Jm3nbGhj4c6qmN9Hk3hxfVypUJI7Wx5miEPStvljNEngPYhuIJohREUp4Cd5cky9 WGgfWEorj5Hs1DBJl6qazTM+ibtVSO0wom1sHtRvL8HWPCRDQw8R8Ud4Gom16A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MD09f0jFvzlcH; Thu, 25 Aug 2022 10:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27PAoULD075878; Thu, 25 Aug 2022 10:50:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27PAoUmi075877; Thu, 25 Aug 2022 10:50:30 GMT (envelope-from git) Date: Thu, 25 Aug 2022 10:50:30 GMT Message-Id: <202208251050.27PAoUmi075877@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 8ecb1f814114 - main - Revert "lang/rust: Update to 1.63.0" List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ecb1f8141144c1603eb4026122d2e60eeaccd64 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661424630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w6rEpxI4wZchCjIfd6i4LfVUj0xR188iEyyPhgH0alk=; b=g4AhlFYGdNNE6TI8RJpEgdo7VJKuhDo3ibBid3NaG//MVJlRkR+697bvDh2DOZGbkgH//A aK5yga7JkFPDmETLRsRkQV/N/tapee+X9M5rKsWAQS6t3LkngIN9FXreL3KuWiibZPBARR hOCuZBOqOj529FTfFqbCp+DjdM6xq53IIiW10GCsed9XAZgfU9L8sY5oOhGxKKDrYamdXT g++Hj0AsI0sBVmSy01dHSND1Z0NfTCzTXnPxJ5IY5UcICKyrApjuQPV8qYcpjUkEb1P3PB MbP8ZcBZyUcZaO2T7abS/qEs6ZH/w6zD6SF3w5KPfQUFwuspVydX1SHpOGXffg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661424630; a=rsa-sha256; cv=none; b=vwZyBSvmjBIIDXT9ckP3AC2taHrZZaxP7gXLOuB64LNfwZ71gxAEXCIlUrT8NBjVrHcfrX rT7ovp1oDh+uaV+AHGrTCXMgrc1lGUQ1vCuHJ7PGiRAFilAZgcizIG9VBTwqBjEJ4SV7rV 3aHpz2mR6TR2W89xkq80azJK6NWX5srnBCSj5X5bd8qPeRw4VcDJMOg/uIb/TyqBCyalVD DwGp8Op/OVlC5M85OjvkHh5dqBB0qyfReBGhk2gVJz3GGm8Ky6O1ZeXzOAcgRHu1UYPUtK 4YU0CIQpJBJK9X2E4/DpaOiP5GukG9liYmwONmubx4xfkPSq/NPGqHotYnVTXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ecb1f8141144c1603eb4026122d2e60eeaccd64 commit 8ecb1f8141144c1603eb4026122d2e60eeaccd64 Author: Piotr Kubaj AuthorDate: 2022-08-25 10:29:24 +0000 Commit: Piotr Kubaj CommitDate: 2022-08-25 10:49:36 +0000 Revert "lang/rust: Update to 1.63.0" This reverts commit f36cc819accadae1fefc14c203e5fbe9c74e1492. I asked for an exp-run for powerpc and powerpc64 on a recently provided cluster machine but got no reply. PR: 265915 --- Mk/Uses/cargo.mk | 2 +- Mk/bsd.gecko.mk | 2 +- lang/rust-bootstrap/Makefile | 2 +- lang/rust-bootstrap/distinfo | 6 +- lang/rust/Makefile | 6 +- lang/rust/distinfo | 126 ++++++++++----------- .../files/no-hardlinks/patch-src_bootstrap_lib.rs | 31 ++--- 7 files changed, 80 insertions(+), 95 deletions(-) diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index 55bedf30b1e9..0a9455fb97a7 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -97,7 +97,7 @@ WRKSRC_crate_${_crate}= ${WRKDIR}/${_wrksrc} CARGO_BUILDDEP?= yes . if ${CARGO_BUILDDEP:tl} == "yes" -BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.63.0:lang/${RUST_DEFAULT} +BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.62.0:lang/${RUST_DEFAULT} . endif # Location of toolchain (default to lang/rust's toolchain) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 047310846c15..2ea394ae9956 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -79,7 +79,7 @@ BUNDLE_LIBS= yes BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \ rust-cbindgen>=0.24.3:devel/rust-cbindgen \ - ${RUST_DEFAULT}>=1.63.0:lang/${RUST_DEFAULT} \ + ${RUST_DEFAULT}>=1.62.0:lang/${RUST_DEFAULT} \ node:www/node LIB_DEPENDS+= libdrm.so:graphics/libdrm RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci diff --git a/lang/rust-bootstrap/Makefile b/lang/rust-bootstrap/Makefile index 45d0358fc877..15eb5696dde9 100644 --- a/lang/rust-bootstrap/Makefile +++ b/lang/rust-bootstrap/Makefile @@ -2,7 +2,7 @@ # to upload them to ~/public_distfiles on freefall in preparation # for the next lang/rust update. PORTNAME= rust -PORTVERSION= 1.63.0 +PORTVERSION= 1.62.0 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/ PKGNAMEPREFIX= ${FLAVOR:S/_/-/g}- diff --git a/lang/rust-bootstrap/distinfo b/lang/rust-bootstrap/distinfo index 26b57a90a332..16c3bdd739b4 100644 --- a/lang/rust-bootstrap/distinfo +++ b/lang/rust-bootstrap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660646335 -SHA256 (rust/rustc-1.63.0-src.tar.xz) = 8f44af6dc44cc4146634a4dd5e4cc5470b3052a2337019b870c0e025e8987e0c -SIZE (rust/rustc-1.63.0-src.tar.xz) = 136597192 +TIMESTAMP = 1656497768 +SHA256 (rust/rustc-1.62.0-src.tar.xz) = 6c00ef115c894c2645e60b5049a4f5dacf1dc0c993f3074f7ae4fdf4c755dd5e +SIZE (rust/rustc-1.62.0-src.tar.xz) = 135644992 diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 919e33e6b29d..10d8809ccdc7 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,5 +1,5 @@ PORTNAME= rust -PORTVERSION?= 1.63.0 +PORTVERSION?= 1.62.1 PORTREVISION?= 0 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/:src \ @@ -68,8 +68,8 @@ WASM_VARS= _COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown WASM_VARS_OFF= _RUST_BUILD_WASM=false # See WRKSRC/src/stage0.json for the date and version values -BOOTSTRAPS_DATE?= 2022-08-11 -RUST_BOOTSTRAP_VERSION?= 1.62.0 +BOOTSTRAPS_DATE?= 2022-05-19 +RUST_BOOTSTRAP_VERSION?= 1.61.0 BOOTSTRAPS_SUFFIX?= ${BOOTSTRAPS_SUFFIX_${ARCH}} BOOTSTRAPS_SUFFIX_powerpc64?= -${PPC_ABI:tl} diff --git a/lang/rust/distinfo b/lang/rust/distinfo index 62c1950596d0..7dcf1e29859a 100644 --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -1,63 +1,63 @@ -TIMESTAMP = 1660637971 -SHA256 (rust/rustc-1.63.0-src.tar.xz) = 8f44af6dc44cc4146634a4dd5e4cc5470b3052a2337019b870c0e025e8987e0c -SIZE (rust/rustc-1.63.0-src.tar.xz) = 136597192 -SHA256 (rust/2022-08-11/rustc-1.62.0-aarch64-unknown-freebsd.tar.xz) = cc389cc6054c2761b55329f996107d02453187149b3597cbebdc4c7a994e4b9f -SIZE (rust/2022-08-11/rustc-1.62.0-aarch64-unknown-freebsd.tar.xz) = 43229728 -SHA256 (rust/2022-08-11/rust-std-1.62.0-aarch64-unknown-freebsd.tar.xz) = 18264b1c019d89f564e3583fae40667eb26a4b918ede59632f7bbb8eb5901ae6 -SIZE (rust/2022-08-11/rust-std-1.62.0-aarch64-unknown-freebsd.tar.xz) = 22683064 -SHA256 (rust/2022-08-11/cargo-1.62.0-aarch64-unknown-freebsd.tar.xz) = be972aa3d1ced03ee216e6d366b46f505ba83cbac682f116ea5cdef5f10963d4 -SIZE (rust/2022-08-11/cargo-1.62.0-aarch64-unknown-freebsd.tar.xz) = 4884760 -SHA256 (rust/2022-08-11/rustc-1.62.0-x86_64-unknown-freebsd.tar.xz) = 2de14a9ca4307453111a82d8733b0d986284d8e78b5bb2d0c5f6a483794502bc -SIZE (rust/2022-08-11/rustc-1.62.0-x86_64-unknown-freebsd.tar.xz) = 36186780 -SHA256 (rust/2022-08-11/rust-std-1.62.0-x86_64-unknown-freebsd.tar.xz) = 0b2a78ec3636a90cab0923612c6ef4f68fe05e788306c33065425093de2846c7 -SIZE (rust/2022-08-11/rust-std-1.62.0-x86_64-unknown-freebsd.tar.xz) = 22828324 -SHA256 (rust/2022-08-11/cargo-1.62.0-x86_64-unknown-freebsd.tar.xz) = b8e36aa5a71d645a0c41eaf2ddeab96d244a6427a05c664a86090cc3d1dc93fd -SIZE (rust/2022-08-11/cargo-1.62.0-x86_64-unknown-freebsd.tar.xz) = 5581840 -SHA256 (rust/2022-08-11/rustc-1.62.0-armv6-unknown-freebsd.tar.xz) = 31112bc0634e805c3dc9ce5cfb7fb8de76610ec75c31f3d8db6d6539600e506a -SIZE (rust/2022-08-11/rustc-1.62.0-armv6-unknown-freebsd.tar.xz) = 44097768 -SHA256 (rust/2022-08-11/rust-std-1.62.0-armv6-unknown-freebsd.tar.xz) = 704d095ef94d0f3ecb27decee036a908c4eeabf9833bec88d7061151c0660dd9 -SIZE (rust/2022-08-11/rust-std-1.62.0-armv6-unknown-freebsd.tar.xz) = 21001436 -SHA256 (rust/2022-08-11/cargo-1.62.0-armv6-unknown-freebsd.tar.xz) = 9eeeea39fac336f4c91563fdb0c1c89052d76095553d7bddc1ca1f14c506a1f8 -SIZE (rust/2022-08-11/cargo-1.62.0-armv6-unknown-freebsd.tar.xz) = 4835312 -SHA256 (rust/2022-08-11/rustc-1.62.0-armv7-unknown-freebsd.tar.xz) = 26b902e38d7f4d98cb5756d821d3917c204d161b47c43d90cbc1b98714392d01 -SIZE (rust/2022-08-11/rustc-1.62.0-armv7-unknown-freebsd.tar.xz) = 43670920 -SHA256 (rust/2022-08-11/rust-std-1.62.0-armv7-unknown-freebsd.tar.xz) = abe9b2841781330618888ff97e0d8cc7e2891ec6e205cbad0ec947c37d415ecc -SIZE (rust/2022-08-11/rust-std-1.62.0-armv7-unknown-freebsd.tar.xz) = 21926488 -SHA256 (rust/2022-08-11/cargo-1.62.0-armv7-unknown-freebsd.tar.xz) = 1c1d0099bac23d31b1f5a9754b10316cce9afacd49c581dc6cb822a0249e95ad -SIZE (rust/2022-08-11/cargo-1.62.0-armv7-unknown-freebsd.tar.xz) = 4823300 -SHA256 (rust/2022-08-11/rustc-1.62.0-i686-unknown-freebsd.tar.xz) = 0fee2caf1ffc5c5769dfac6affcbe7fc77f22fdf9af61f9c6b4e24cae9a846cd -SIZE (rust/2022-08-11/rustc-1.62.0-i686-unknown-freebsd.tar.xz) = 49032044 -SHA256 (rust/2022-08-11/rust-std-1.62.0-i686-unknown-freebsd.tar.xz) = f50746696a7141f279c3dad031e9a26240eb6a831e150758df117063536aa2f2 -SIZE (rust/2022-08-11/rust-std-1.62.0-i686-unknown-freebsd.tar.xz) = 22732580 -SHA256 (rust/2022-08-11/cargo-1.62.0-i686-unknown-freebsd.tar.xz) = 4308d5097b754d09b4124b4f5b461d835a1929ece5195931bd853d1aea8c4123 -SIZE (rust/2022-08-11/cargo-1.62.0-i686-unknown-freebsd.tar.xz) = 5744176 -SHA256 (rust/2022-08-11/rustc-1.62.0-powerpc-unknown-freebsd.tar.xz) = 3de22d8843ce97bf04d606c7731e7fcf35feae5c17871df5f7bd7568a5dac1ca -SIZE (rust/2022-08-11/rustc-1.62.0-powerpc-unknown-freebsd.tar.xz) = 46413824 -SHA256 (rust/2022-08-11/rust-std-1.62.0-powerpc-unknown-freebsd.tar.xz) = a7c0ea9c3163a1375ac268a34ef85bafc1173ce31082b76e7ce82a7b74d38614 -SIZE (rust/2022-08-11/rust-std-1.62.0-powerpc-unknown-freebsd.tar.xz) = 20653544 -SHA256 (rust/2022-08-11/cargo-1.62.0-powerpc-unknown-freebsd.tar.xz) = e37fab0dfd028fac8c530aa685c47aa12ba2d89ffb34d72e403f457f05b040d9 -SIZE (rust/2022-08-11/cargo-1.62.0-powerpc-unknown-freebsd.tar.xz) = 5318004 -SHA256 (rust/2022-08-11/rustc-1.62.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 1e2b2fdde88775c872b3b0c6b7df48c0edbe4334ac859997123ad272c6ef6028 -SIZE (rust/2022-08-11/rustc-1.62.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 52646328 -SHA256 (rust/2022-08-11/rust-std-1.62.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 4a65020427f638a6e948040676934eedcaa416e183db8139f83d83b06eebafd8 -SIZE (rust/2022-08-11/rust-std-1.62.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 20886148 -SHA256 (rust/2022-08-11/cargo-1.62.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 73047a7b498f5a7403f7c722e6ced16639538e6ef1040eca6fe80911eca20380 -SIZE (rust/2022-08-11/cargo-1.62.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 5421660 -SHA256 (rust/2022-08-11/rustc-1.62.0-powerpc64le-unknown-freebsd.tar.xz) = a0a990c2e459f06cdc16d509e2a7046528d870df0974eff3eacad11654f0a990 -SIZE (rust/2022-08-11/rustc-1.62.0-powerpc64le-unknown-freebsd.tar.xz) = 46361760 -SHA256 (rust/2022-08-11/rust-std-1.62.0-powerpc64le-unknown-freebsd.tar.xz) = 510b7ae43543acffc27ea788725ab7e683236323652296fb117443bdb87e4bca -SIZE (rust/2022-08-11/rust-std-1.62.0-powerpc64le-unknown-freebsd.tar.xz) = 21088000 -SHA256 (rust/2022-08-11/cargo-1.62.0-powerpc64le-unknown-freebsd.tar.xz) = 007e4c54449cf95ae5bbc86c559767feaae543a129b3a4d4dbc99822697765ab -SIZE (rust/2022-08-11/cargo-1.62.0-powerpc64le-unknown-freebsd.tar.xz) = 5354032 -SHA256 (rust/2022-08-11/rustc-1.62.0-riscv64gc-unknown-freebsd.tar.xz) = fe0551721b4a4e0c17236a7527eb5c8006d3dcbba1e18bfd997bba1aff7320f3 -SIZE (rust/2022-08-11/rustc-1.62.0-riscv64gc-unknown-freebsd.tar.xz) = 151000056 -SHA256 (rust/2022-08-11/rust-std-1.62.0-riscv64gc-unknown-freebsd.tar.xz) = 26e3296d3e665a0049c638216c5da194dc500ae94942f5bd37c41d7512b95202 -SIZE (rust/2022-08-11/rust-std-1.62.0-riscv64gc-unknown-freebsd.tar.xz) = 28966484 -SHA256 (rust/2022-08-11/cargo-1.62.0-riscv64gc-unknown-freebsd.tar.xz) = 4f72f54faebca015d674a53394eda4ec7b07bc70547186dbefca45b71a9c00ea -SIZE (rust/2022-08-11/cargo-1.62.0-riscv64gc-unknown-freebsd.tar.xz) = 27235120 -SHA256 (rust/2022-08-11/rustc-1.62.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 85282443cc7972af82999c24093a792143a642fb5f32a636c900019e0df30109 -SIZE (rust/2022-08-11/rustc-1.62.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 44366840 -SHA256 (rust/2022-08-11/rust-std-1.62.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = eea977e6cbffdb226056091c3ab565c2b3c933d37ab1a30a2baa5eccc47e2c9b -SIZE (rust/2022-08-11/rust-std-1.62.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 20893088 -SHA256 (rust/2022-08-11/cargo-1.62.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = a36cd48122c84601cf2610d0cb381e3482bc25ef3f37d6d790eaa6a1a5a1e500 -SIZE (rust/2022-08-11/cargo-1.62.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 5048488 +TIMESTAMP = 1658240928 +SHA256 (rust/rustc-1.62.1-src.tar.xz) = 02066a93c2f6596cc046a897d5716c86e3607c1cd0f54db9a867ae8c8265072e +SIZE (rust/rustc-1.62.1-src.tar.xz) = 135644156 +SHA256 (rust/2022-05-19/rustc-1.61.0-aarch64-unknown-freebsd.tar.xz) = 042eec2e8a6eff9bf754594e989f4d82b9a45bd86e32c8782146ccb55b1845b0 +SIZE (rust/2022-05-19/rustc-1.61.0-aarch64-unknown-freebsd.tar.xz) = 41988500 +SHA256 (rust/2022-05-19/rust-std-1.61.0-aarch64-unknown-freebsd.tar.xz) = 518aa33a3fad35cf65f91b9816664c82f6e421d57389a45193f3e032b03d4e73 +SIZE (rust/2022-05-19/rust-std-1.61.0-aarch64-unknown-freebsd.tar.xz) = 23570368 +SHA256 (rust/2022-05-19/cargo-1.61.0-aarch64-unknown-freebsd.tar.xz) = 3f294d64552351f159885868ffeac107fd1dbc62c550506ad4b8b595747a8c1e +SIZE (rust/2022-05-19/cargo-1.61.0-aarch64-unknown-freebsd.tar.xz) = 4794716 +SHA256 (rust/2022-05-19/rustc-1.61.0-x86_64-unknown-freebsd.tar.xz) = e3ec7b3e7913e1613e973202a915539922cda424fe0e22f17a0106f075158152 +SIZE (rust/2022-05-19/rustc-1.61.0-x86_64-unknown-freebsd.tar.xz) = 37986400 +SHA256 (rust/2022-05-19/rust-std-1.61.0-x86_64-unknown-freebsd.tar.xz) = a35bd8f17d2141e1c5384b02f0775838c08e6c4e8b5d74c5d42681f80268cab5 +SIZE (rust/2022-05-19/rust-std-1.61.0-x86_64-unknown-freebsd.tar.xz) = 23842720 +SHA256 (rust/2022-05-19/cargo-1.61.0-x86_64-unknown-freebsd.tar.xz) = 70e78458896f94ed172ac4e3caf3f54eddb2a9bcca81c42800117383ba988c95 +SIZE (rust/2022-05-19/cargo-1.61.0-x86_64-unknown-freebsd.tar.xz) = 5502300 +SHA256 (rust/2022-05-19/rustc-1.61.0-armv6-unknown-freebsd.tar.xz) = 9268265126c7ae989c03d1f8710ed29182a6d1a9c5217fd7ee6558e5b8b29076 +SIZE (rust/2022-05-19/rustc-1.61.0-armv6-unknown-freebsd.tar.xz) = 42901832 +SHA256 (rust/2022-05-19/rust-std-1.61.0-armv6-unknown-freebsd.tar.xz) = a0f00fc1b3dca64e4fe32ea7ef96409519cced71e58841425cb444b7189e09a6 +SIZE (rust/2022-05-19/rust-std-1.61.0-armv6-unknown-freebsd.tar.xz) = 21817044 +SHA256 (rust/2022-05-19/cargo-1.61.0-armv6-unknown-freebsd.tar.xz) = 6593e951345c557fa90c7732130bddfb89a6df7dc4b5d79e701740e7fc48d98a +SIZE (rust/2022-05-19/cargo-1.61.0-armv6-unknown-freebsd.tar.xz) = 4747396 +SHA256 (rust/2022-05-19/rustc-1.61.0-armv7-unknown-freebsd.tar.xz) = d83086bf4355cc92baf908b313c3f83821ab7407a59edc2e99a234b6f56db71c +SIZE (rust/2022-05-19/rustc-1.61.0-armv7-unknown-freebsd.tar.xz) = 42713712 +SHA256 (rust/2022-05-19/rust-std-1.61.0-armv7-unknown-freebsd.tar.xz) = 5bbdccac7a91bcbdeea3295f12e10a86515f550ece6118383f90657a247e022e +SIZE (rust/2022-05-19/rust-std-1.61.0-armv7-unknown-freebsd.tar.xz) = 22793208 +SHA256 (rust/2022-05-19/cargo-1.61.0-armv7-unknown-freebsd.tar.xz) = 24814d99e7811cfac6a51848d6a63fd6f38f9b845b29dbad550585067d6beb8d +SIZE (rust/2022-05-19/cargo-1.61.0-armv7-unknown-freebsd.tar.xz) = 4733024 +SHA256 (rust/2022-05-19/rustc-1.61.0-i686-unknown-freebsd.tar.xz) = 9aef4d35438a70b8239976364b6b7266f6f15e64b40463f81329938cda167576 +SIZE (rust/2022-05-19/rustc-1.61.0-i686-unknown-freebsd.tar.xz) = 47040012 +SHA256 (rust/2022-05-19/rust-std-1.61.0-i686-unknown-freebsd.tar.xz) = 2f4b31a12a46cf4d778b6ff44503c0b4f5019870a8f27472b6c26cd387aabbf0 +SIZE (rust/2022-05-19/rust-std-1.61.0-i686-unknown-freebsd.tar.xz) = 23667232 +SHA256 (rust/2022-05-19/cargo-1.61.0-i686-unknown-freebsd.tar.xz) = c3cc0f5e0b57fa220fb0d44813409584ad1d6352c2a5dc77ffe9211338c412ae +SIZE (rust/2022-05-19/cargo-1.61.0-i686-unknown-freebsd.tar.xz) = 5650840 +SHA256 (rust/2022-05-19/rustc-1.61.0-powerpc-unknown-freebsd.tar.xz) = 0ca81deb0faa343ff420b7f9e6f325eac366a15128b1e096eb3062516e48e36b +SIZE (rust/2022-05-19/rustc-1.61.0-powerpc-unknown-freebsd.tar.xz) = 44567188 +SHA256 (rust/2022-05-19/rust-std-1.61.0-powerpc-unknown-freebsd.tar.xz) = a3a26ab34a9f62d1b9a0dba45f4d63c25994d222ddabdf909be9217b93ce6415 +SIZE (rust/2022-05-19/rust-std-1.61.0-powerpc-unknown-freebsd.tar.xz) = 21657860 +SHA256 (rust/2022-05-19/cargo-1.61.0-powerpc-unknown-freebsd.tar.xz) = 4d3f3da61d993e8698d9bb13aa6eb75f00e0567b23a4e2809adde47b0e8372f0 +SIZE (rust/2022-05-19/cargo-1.61.0-powerpc-unknown-freebsd.tar.xz) = 5232608 +SHA256 (rust/2022-05-19/rustc-1.61.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 5f8878946c10350ce2ed4751baa1dd467cbbce223899086c631dc4e714bad09f +SIZE (rust/2022-05-19/rustc-1.61.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 51265100 +SHA256 (rust/2022-05-19/rust-std-1.61.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 45eea66649936ccc789309381a0e2cb82ee63bf7fc902262eab664cd40d373a8 +SIZE (rust/2022-05-19/rust-std-1.61.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 21767000 +SHA256 (rust/2022-05-19/cargo-1.61.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 91dfca32008126f8f526cd4913e487341c968b82b6e094df15a4760dfca400ea +SIZE (rust/2022-05-19/cargo-1.61.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 5345408 +SHA256 (rust/2022-05-19/rustc-1.61.0-powerpc64le-unknown-freebsd.tar.xz) = 0f22827e20c6aed0b67450f228bfdc44b5b83abbffd9bb8bf1d529ee94aa9b95 +SIZE (rust/2022-05-19/rustc-1.61.0-powerpc64le-unknown-freebsd.tar.xz) = 44874472 +SHA256 (rust/2022-05-19/rust-std-1.61.0-powerpc64le-unknown-freebsd.tar.xz) = bae7067eac67fede90defecb5250985fc8b7fdcd22435acb795901e8a75f1f96 +SIZE (rust/2022-05-19/rust-std-1.61.0-powerpc64le-unknown-freebsd.tar.xz) = 21828580 +SHA256 (rust/2022-05-19/cargo-1.61.0-powerpc64le-unknown-freebsd.tar.xz) = 2fe81b4ee62a5370f6e5a6dc5a46d00871a9c77513eb165664e871cd66f8adac +SIZE (rust/2022-05-19/cargo-1.61.0-powerpc64le-unknown-freebsd.tar.xz) = 5265304 +SHA256 (rust/2022-05-19/rustc-1.61.0-riscv64gc-unknown-freebsd.tar.xz) = d2d371908a8dcd49db81bd2db048c57a968e0ec8a00918ad2f80fcd306862855 +SIZE (rust/2022-05-19/rustc-1.61.0-riscv64gc-unknown-freebsd.tar.xz) = 139529684 +SHA256 (rust/2022-05-19/rust-std-1.61.0-riscv64gc-unknown-freebsd.tar.xz) = 0ee3a580304386a75ec500f0c9f1e853a9922c4b9521d4577a559b120e865795 +SIZE (rust/2022-05-19/rust-std-1.61.0-riscv64gc-unknown-freebsd.tar.xz) = 29642992 +SHA256 (rust/2022-05-19/cargo-1.61.0-riscv64gc-unknown-freebsd.tar.xz) = 89522660fbc8718ab394566fb7daf5ce95fdbabec49e7a322d561f8d81c53e1f +SIZE (rust/2022-05-19/cargo-1.61.0-riscv64gc-unknown-freebsd.tar.xz) = 26543872 +SHA256 (rust/2022-05-19/rustc-1.61.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 16d5a9a0b8f7b75ad76efcdf4bf3b7ad51d5ffae21cf04c64696803879081ffb +SIZE (rust/2022-05-19/rustc-1.61.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 42802348 +SHA256 (rust/2022-05-19/rust-std-1.61.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 5526d0f46a2829a3b4ce5147f8ce9cdc5144a811e7362cbe5666df0a35420fe0 +SIZE (rust/2022-05-19/rust-std-1.61.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 21712780 +SHA256 (rust/2022-05-19/cargo-1.61.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 5b6fc2baa3647abee442373006da6cbccbe16b6720520bdc7ecc3b998e003538 +SIZE (rust/2022-05-19/cargo-1.61.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4966568 diff --git a/lang/rust/files/no-hardlinks/patch-src_bootstrap_lib.rs b/lang/rust/files/no-hardlinks/patch-src_bootstrap_lib.rs index 03a24563bf05..081c2056ad2c 100644 --- a/lang/rust/files/no-hardlinks/patch-src_bootstrap_lib.rs +++ b/lang/rust/files/no-hardlinks/patch-src_bootstrap_lib.rs @@ -15,29 +15,14 @@ links during the build, so let's try that. --- src/bootstrap/lib.rs.orig 2020-07-23 20:16:43 UTC +++ src/bootstrap/lib.rs -@@ -1450,19 +1450,13 @@ impl Build { - return; - } - } -- if let Ok(()) = fs::hard_link(&src, dst) { +@@ -1173,10 +1173,6 @@ impl Build { + if metadata.file_type().is_symlink() { + let link = t!(fs::read_link(src)); + t!(symlink_file(link, dst)); +- } else if let Ok(()) = fs::hard_link(src, dst) { - // Attempt to "easy copy" by creating a hard link - // (symlinks don't work on windows), but if that fails - // just fall back to a slow `copy` operation. -- } else { -- if let Err(e) = fs::copy(&src, dst) { -- panic!("failed to copy `{}` to `{}`: {}", src.display(), dst.display(), e) -- } -- t!(fs::set_permissions(dst, metadata.permissions())); -- let atime = FileTime::from_last_access_time(&metadata); -- let mtime = FileTime::from_last_modification_time(&metadata); -- t!(filetime::set_file_times(dst, atime, mtime)); -+ if let Err(e) = fs::copy(&src, dst) { -+ panic!("failed to copy `{}` to `{}`: {}", src.display(), dst.display(), e) - } -+ t!(fs::set_permissions(dst, metadata.permissions())); -+ let atime = FileTime::from_last_access_time(&metadata); -+ let mtime = FileTime::from_last_modification_time(&metadata); -+ t!(filetime::set_file_times(dst, atime, mtime)); - } - - /// Copies the `src` directory recursively to `dst`. Both are assumed to exist + } else { + if let Err(e) = fs::copy(src, dst) { + panic!("failed to copy `{}` to `{}`: {}", src.display(), dst.display(), e)