-
Notifications
You must be signed in to change notification settings - Fork 160
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Pkgsrc changes: * Sadly, I had to reinstate the "make tar files" rust code to make it possible to build cross-compiled bootstrap kits. * Add an adjustable "BUILD_TARGET", "dist" for cross-building a bootstrap kit, "build" for a normal native build. * New bootstrap kits built for NetBSD/powerpc, NetBSD/earmv7hf, and NetBSD/sparc64 version 1.31.1. * gcc-wrap script amended to also drop -Wl,--enable-new-dtags (so it could be used outside pkgsrc) * Worked around use of AtomicU64 in release build tool (ugly band-aid patch). Some platforms lack support for that type and associated operations. Upstream changes: - [Fix Rust failing to build on `powerpc-unknown-netbsd`][56562] - [Fix broken go-to-definition in RLS][rls/1171] - [Fix infinite loop on hover in RLS][rls/1170] [56562]: rust-lang/rust#56562 [rls/1171]: rust-lang/rls#1171 [rls/1170]: rust-lang/rls#1170
- Loading branch information
Showing
6 changed files
with
144 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| $NetBSD: patch-src_tools_rls_src_cmd.rs,v 1.1 2018/12/21 23:12:34 he Exp $ | ||
|
|
||
| --- src/tools/rls/src/cmd.rs.orig 2018-12-18 23:12:41.000000000 +0000 | ||
| +++ src/tools/rls/src/cmd.rs | ||
| @@ -17,7 +17,7 @@ use crate::config::Config; | ||
| use crate::server::{self, LsService, Notification, Request, RequestId}; | ||
| use rls_analysis::{AnalysisHost, Target}; | ||
| use rls_vfs::Vfs; | ||
| -use std::sync::atomic::{AtomicU64, Ordering}; | ||
| +use std::sync::atomic::{AtomicU32, Ordering}; | ||
|
|
||
| use languageserver_types::{ | ||
| ClientCapabilities, CodeActionContext, CodeActionParams, CompletionItem, | ||
| @@ -424,8 +424,8 @@ fn url(file_name: &str) -> Url { | ||
| } | ||
|
|
||
| fn next_id() -> RequestId { | ||
| - static ID: AtomicU64 = AtomicU64::new(1); | ||
| - RequestId::Num(ID.fetch_add(1, Ordering::SeqCst)) | ||
| + static ID: AtomicU32 = AtomicU32::new(1); | ||
| + RequestId::Num(ID.fetch_add(1, Ordering::SeqCst) as u64) | ||
| } | ||
|
|
||
| // Custom reader and output for the RLS server. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| $NetBSD: patch-src_tools_rls_src_server_io.rs,v 1.1 2018/12/21 23:12:34 he Exp $ | ||
|
|
||
| --- src/tools/rls/src/server/io.rs.orig 2018-12-18 23:12:41.000000000 +0000 | ||
| +++ src/tools/rls/src/server/io.rs | ||
| @@ -17,7 +17,7 @@ use crate::lsp_data::{LSPNotification, L | ||
|
|
||
| use std::fmt; | ||
| use std::io::{self, BufRead, Write}; | ||
| -use std::sync::atomic::{AtomicU64, Ordering}; | ||
| +use std::sync::atomic::{AtomicU32, Ordering}; | ||
| use std::sync::Arc; | ||
|
|
||
| use jsonrpc_core::{self as jsonrpc, response, version, Id}; | ||
| @@ -190,14 +190,14 @@ pub trait Output: Sync + Send + Clone + | ||
| /// An output that sends notifications and responses on `stdout`. | ||
| #[derive(Clone)] | ||
| pub(super) struct StdioOutput { | ||
| - next_id: Arc<AtomicU64>, | ||
| + next_id: Arc<AtomicU32>, | ||
| } | ||
|
|
||
| impl StdioOutput { | ||
| /// Construct a new `stdout` output. | ||
| crate fn new() -> StdioOutput { | ||
| StdioOutput { | ||
| - next_id: Arc::new(AtomicU64::new(1)), | ||
| + next_id: Arc::new(AtomicU32::new(1)), | ||
| } | ||
| } | ||
| } | ||
| @@ -215,7 +215,7 @@ impl Output for StdioOutput { | ||
| } | ||
|
|
||
| fn provide_id(&self) -> RequestId { | ||
| - RequestId::Num(self.next_id.fetch_add(1, Ordering::SeqCst)) | ||
| + RequestId::Num(self.next_id.fetch_add(1, Ordering::SeqCst) as u64) | ||
| } | ||
| } | ||
|
|
26 changes: 0 additions & 26 deletions
26
lang/rust/patches/patch-src_tools_rust-installer_src_generator.rs
This file was deleted.
Oops, something went wrong.