From nobody Fri Mar 17 08:19:54 2023 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 4PdH9k4kf6z3y2vd; Fri, 17 Mar 2023 08:19:54 +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 4PdH9k4D3tz4HmS; Fri, 17 Mar 2023 08:19:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679041194; 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=L1ImISJzGPrarUQ7xSx1qeFsNoyohi75kfc9JGY7cZk=; b=STk5pqBrvDfm8uI6l99LyFDYvhSi0Pv/O/NJWvKk4m6sdXYq4uFX/Y9jm+oM7clcsUb4HA ayntRfyAr1+7Awu9+gsXEm6YLxDKg/sSvipCA/6/vI1i/ozh8F8rXn4vLic5D6/3vGv8XP MBosKnXoNHtcMW1qex6vltxdkvOrTQG6eP2B0ybs/S4/ev6nMppPlroMmLzHBW849ctWqr Dk1RjTUMe7HPCAb7uOdYOhRPp1TCiG4QsWDWAsdwp9cqhjcqH8oIm6nxvOqE+FOo2wsxlX aPBBhNvnUAo4pOnVFSwbFepCk4yDhFvBsDHV82u4atY5+hHBg7AkaIgrQ3WjLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679041194; 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=L1ImISJzGPrarUQ7xSx1qeFsNoyohi75kfc9JGY7cZk=; b=hzsQwX97Xu0U/e0T2CHG2Aax/mEGlSAToOcvglxJQX7lPzYwviGBgqvXfeklTLUxYw9etM Serw0bZZLR7MwEW4cufPyno0UbNRNRNSAcLwi95LpjtZUJ1FVWP86EgdHVCdlWAlG4Je/i vAFkHQNwJWSTY+pV2Gx0zegcjZPRUN2WIAGq/5FrAlbb8O+vo3AtVI+3jOAKqGN2wI6nNO +eYZJJw6xgtB9kL70ErOSuuRwHO8CaRTCc1SRLMQ93l4pZTevkxe3PvCSKT+7/hjlt8v9k GuAToiK4rM11XIW0TFK3Y0cLLAfCT6ZkddR6+kWmQL30fbHF4KvEqN4twaGk4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679041194; a=rsa-sha256; cv=none; b=DWUUkaGuvGltn7BnKTetybaTWk4/vcsJD2H0EY4M9fjiw/ozrJ+r6vJpN+nFAkqLJP1Gr/ HCCaesJCXB7H8wD2uRk0NirvD1ITlSv8SXXYnCV0cNy6tPX4IXeyj0VphakMx/Inx4U8mI FU0OGp+fD4ZM2Z8mMiEr7VuwHKRfFwDly/Sdg/3TRPaDOOxjhYYPsvJ6EDU9fQsmWrcHc9 gh/KFI0Q5DoY7QmNCfhLicNYgB5omkAouxFzcw0UowYT+YaN8hvRDjOnaKtwJqXyIT/SmJ e9Qb4RtzQuoiAC/UQR6VI5qXH0RsAzxWnGYpVyHuIFzIkR2Iw4NN2oMyZRAIYQ== 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 4PdH9k2yllzJBS; Fri, 17 Mar 2023 08:19:54 +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 32H8Jsqr052808; Fri, 17 Mar 2023 08:19:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32H8JsZa052807; Fri, 17 Mar 2023 08:19:54 GMT (envelope-from git) Date: Fri, 17 Mar 2023 08:19:54 GMT Message-Id: <202303170819.32H8JsZa052807@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: d050a1c356a5 - main - lang/rust: garbage collect patch 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: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d050a1c356a566137b1d5c6f74772788a6d08779 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=d050a1c356a566137b1d5c6f74772788a6d08779 commit d050a1c356a566137b1d5c6f74772788a6d08779 Author: Mikael Urankar AuthorDate: 2023-03-17 08:18:49 +0000 Commit: Mikael Urankar CommitDate: 2023-03-17 08:19:51 +0000 lang/rust: garbage collect patch PR: 270271 --- .../no-hardlinks/patch-src_bootstrap_native.rs | 40 ---------------------- 1 file changed, 40 deletions(-) diff --git a/lang/rust/files/no-hardlinks/patch-src_bootstrap_native.rs b/lang/rust/files/no-hardlinks/patch-src_bootstrap_native.rs deleted file mode 100644 index 2e4a03cd315c..000000000000 --- a/lang/rust/files/no-hardlinks/patch-src_bootstrap_native.rs +++ /dev/null @@ -1,40 +0,0 @@ -There seems to be some kind of race when using llvm-config-wrapper -for building rust-lld. Attempt to improve reliability of the build -by not using it. llvm-config-wrapper is a hack in the first place -that is only really needed on Windows. - ---- src/bootstrap/native.rs.orig 2020-08-24 15:00:49 UTC -+++ src/bootstrap/native.rs -@@ -634,22 +634,6 @@ impl Step for Lld { - let mut cfg = cmake::Config::new(builder.src.join("src/llvm-project/lld")); - configure_cmake(builder, target, &mut cfg, true, LdFlags::default()); - -- // This is an awful, awful hack. Discovered when we migrated to using -- // clang-cl to compile LLVM/LLD it turns out that LLD, when built out of -- // tree, will execute `llvm-config --cmakedir` and then tell CMake about -- // that directory for later processing. Unfortunately if this path has -- // forward slashes in it (which it basically always does on Windows) -- // then CMake will hit a syntax error later on as... something isn't -- // escaped it seems? -- // -- // Instead of attempting to fix this problem in upstream CMake and/or -- // LLVM/LLD we just hack around it here. This thin wrapper will take the -- // output from llvm-config and replace all instances of `\` with `/` to -- // ensure we don't hit the same bugs with escaping. It means that you -- // can't build on a system where your paths require `\` on Windows, but -- // there's probably a lot of reasons you can't do that other than this. -- let llvm_config_shim = env::current_exe().unwrap().with_file_name("llvm-config-wrapper"); -- - // Re-use the same flags as llvm to control the level of debug information - // generated for lld. - let profile = match (builder.config.llvm_optimize, builder.config.llvm_release_debuginfo) { -@@ -660,8 +644,7 @@ impl Step for Lld { - - cfg.out_dir(&out_dir) - .profile(profile) -- .env("LLVM_CONFIG_REAL", &llvm_config) -- .define("LLVM_CONFIG_PATH", llvm_config_shim) -+ .define("LLVM_CONFIG_PATH", &llvm_config) - .define("LLVM_INCLUDE_TESTS", "OFF"); - - // While we're using this horrible workaround to shim the execution of