From: ifreund <ifreund@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [WIP] Rust 1.54.0
Date: Wed, 18 Aug 2021 23:54:27 +0200 [thread overview]
Message-ID: <20210818215427.u955G_oajcmcHZqcPFgsDIrvKQA2JyLtgqwJAEMv_K0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32555@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 2387 bytes --]
New comment by ifreund on void-packages repository
https://github.com/void-linux/void-packages/pull/32555#issuecomment-901454842
Comment:
@ericonr Here's a patch for that patch:
```diff
diff --git a/srcpkgs/rust/patches/0003-Require-static-native-libraries-when-linking-static-.patch b/srcpkgs/rust/patches/0003-Require-static-native-libraries-when-linking-static-.patch
index 88e29d9ebc..b2e61ddb0b 100644
--- a/srcpkgs/rust/patches/0003-Require-static-native-libraries-when-linking-static-.patch
+++ b/srcpkgs/rust/patches/0003-Require-static-native-libraries-when-linking-static-.patch
@@ -16,13 +16,13 @@ diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codege
index 6c9ec9e7b0d..60f43f70e4e 100644
--- a/compiler/rustc_codegen_ssa/src/back/link.rs
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
-@@ -2396,10 +2396,23 @@ fn add_upstream_native_libraries(
+@@ -2396,10 +2396,24 @@ fn add_upstream_native_libraries(
let verbatim = lib.verbatim.unwrap_or(false);
match lib.kind {
- NativeLibKind::Dylib { as_needed } => {
- cmd.link_dylib(name, verbatim, as_needed.unwrap_or(true))
-+ NativeLibKind::Dylib | NativeLibKind::Unspecified => {
++ NativeLibKind::Dylib { .. } | NativeLibKind::Unspecified => {
+ // On some targets, like Linux, linking a static executable inhibits using
+ // dylibs at all. Force native libraries to be static, even if for example
+ // an upstream rlib was originally linked against a native shared library.
@@ -34,8 +34,9 @@ index 6c9ec9e7b0d..60f43f70e4e 100644
+ } else {
+ cmd.link_dylib(name, verbatim,
+ match lib.kind {
-+ NativeLibKind::Dylib => as_needed.unwrap_or(true),
-+ NativeLibKind::Unspecified => true
++ NativeLibKind::Dylib { as_needed } => as_needed.unwrap_or(true),
++ NativeLibKind::Unspecified => true,
++ _ => unreachable!()
+ })
+ }
}
```
next prev parent reply other threads:[~2021-08-18 21:54 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-17 21:13 [PR PATCH] " ericonr
2021-08-18 1:18 ` ericonr
2021-08-18 21:54 ` ifreund
2021-08-18 21:54 ` ifreund [this message]
2021-08-19 2:47 ` [PR PATCH] [Updated] " ericonr
2021-08-19 5:31 ` ericonr
2021-09-17 14:18 ` ram02z
2021-09-17 23:01 ` cinerea0
2021-10-04 1:53 ` uninhm
2021-10-14 17:51 ` cinerea0
2021-10-21 17:49 ` cinerea0
2021-10-21 17:57 ` cinerea0
2021-10-22 1:38 ` cinerea0
2021-10-30 5:14 ` cinerea0
2021-11-01 5:39 ` cinerea0
2021-11-02 5:27 ` ericonr
2021-11-04 3:59 ` cinerea0
2021-11-11 2:26 ` cinerea0
2021-11-14 8:04 ` kartikynwa
2021-11-23 23:29 ` cinerea0
2021-12-03 3:33 ` cinerea0
2021-12-06 1:11 ` flyxi121
2021-12-06 1:55 ` ericonr
2021-12-06 23:06 ` flyxi121
2021-12-07 17:52 ` flyxi121
2021-12-07 18:49 ` flyxi121
2021-12-07 19:03 ` ericonr
2021-12-07 19:03 ` [PR PATCH] [Updated] " ericonr
2021-12-07 19:12 ` flyxi121
2021-12-07 19:16 ` flyxi121
2021-12-08 1:24 ` flyxi121
2021-12-13 18:46 ` leahneukirchen
2021-12-14 3:35 ` ericonr
2021-12-15 15:11 ` flyxi121
2021-12-19 4:17 ` ericonr
2021-12-20 3:54 ` [PR PATCH] [Updated] " ericonr
2021-12-20 3:55 ` Rust 1.57.0 ericonr
2021-12-22 19:51 ` cinerea0
2022-01-02 19:11 ` cinerea0
2022-01-04 15:52 ` [PR PATCH] [Closed]: " q66
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210818215427.u955G_oajcmcHZqcPFgsDIrvKQA2JyLtgqwJAEMv_K0@z \
--to=ifreund@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).