Backport windows build fixes (#11004)

* Bump spl-memo

* spl memo linking windows (#11000)

* Update spl-memo to fix windows linking error

* Only programs need the stubs

Co-authored-by: Ryo Onodera <ryoqun@gmail.com>

Co-authored-by: Jack May <jack@solana.com>
Co-authored-by: Ryo Onodera <ryoqun@gmail.com>
This commit is contained in:
Tyera Eulberg
2020-07-10 21:46:11 -06:00
committed by GitHub
parent 5205eb382e
commit 03e505897a
4 changed files with 13 additions and 4 deletions

11
Cargo.lock generated
View File

@ -4679,6 +4679,12 @@ dependencies = [
"tiny-bip39",
]
[[package]]
name = "solana-sdk-bpf-test"
version = "1.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1e668937b3fc2ecb13ad0285f318b0f81ba06c1b923d4cbc4d9868fb09d39d8"
[[package]]
name = "solana-sdk-macro"
version = "1.2.4"
@ -5330,11 +5336,12 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
name = "spl-memo"
version = "1.0.0"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22e6b954ac8b1df3f0bbb6ad1f21607be304f3cc9914bb9107c44b2065c8479e"
checksum = "db4ebc6a6d50b55cbe7c84c7f6cd0259f4f82a169eb49ef65ca62b9c69a76a1f"
dependencies = [
"solana-sdk 1.2.4",
"solana-sdk-bpf-test",
]
[[package]]

View File

@ -15,7 +15,7 @@ Inflector = "0.11.4"
lazy_static = "1.4.0"
solana-sdk = { path = "../sdk", version = "1.2.11" }
solana-vote-program = { path = "../programs/vote", version = "1.2.11" }
spl-memo = "1.0.0"
spl-memo = "1.0.1"
serde = "1.0.112"
serde_derive = "1.0.103"
serde_json = "1.0.54"

View File

@ -1,5 +1,7 @@
//! @brief Stubs for syscalls when building tests for non-BPF targets
#![cfg(feature = "program")]
#[cfg(not(target_arch = "bpf"))]
fn print_line_to_stdout(_message: &str) {
#[cfg(not(feature = "program"))]

View File

@ -14,7 +14,7 @@ bs58 = "0.3.1"
Inflector = "0.11.4"
lazy_static = "1.4.0"
solana-sdk = { path = "../sdk", version = "1.2.11" }
spl-memo = "1.0.0"
spl-memo = "1.0.1"
serde = "1.0.110"
serde_derive = "1.0.103"
serde_json = "1.0.54"