From 03e505897a86d2e616931ad9cc6624ab24f48b91 Mon Sep 17 00:00:00 2001
From: Tyera Eulberg <teulberg@gmail.com>
Date: Fri, 10 Jul 2020 21:46:11 -0600
Subject: [PATCH] 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>
---
 Cargo.lock                    | 11 +++++++++--
 account-decoder/Cargo.toml    |  2 +-
 sdk/src/program_stubs.rs      |  2 ++
 transaction-status/Cargo.toml |  2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ef5b34f2db..ce72a8bf02 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -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]]
diff --git a/account-decoder/Cargo.toml b/account-decoder/Cargo.toml
index 47780ba886..22cf5f82cf 100644
--- a/account-decoder/Cargo.toml
+++ b/account-decoder/Cargo.toml
@@ -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"
diff --git a/sdk/src/program_stubs.rs b/sdk/src/program_stubs.rs
index b3557ed001..4593a8e257 100644
--- a/sdk/src/program_stubs.rs
+++ b/sdk/src/program_stubs.rs
@@ -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"))]
diff --git a/transaction-status/Cargo.toml b/transaction-status/Cargo.toml
index 08ae0d73ae..f66069b489 100644
--- a/transaction-status/Cargo.toml
+++ b/transaction-status/Cargo.toml
@@ -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"