Skip to content

Commit

Permalink
Add more comments about solana-program patch (downstream) (solana-lab…
Browse files Browse the repository at this point in the history
…s#33965)

* Add more comments re solana-program patch

* More specific advice
  • Loading branch information
Tyera authored Nov 7, 2023
1 parent 87b4dc6 commit e93725e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
7 changes: 7 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,13 @@ crossbeam-epoch = { git = "https://github.com/solana-labs/crossbeam", rev = "fd2
# and we end up with two versions of `solana-program` and `solana-zk-token-sdk` and all of their
# dependencies in our build tree.
#
# If you are developing downstream using non-crates-io solana-program (local or
# forked repo, or from github rev, eg), duplicate the following patch statements
# in your Cargo.toml. If you still hit duplicate-type errors with the patch
# statements in place, run `cargo update -p solana-program` and/or `cargo update
# -p solana-zk-token-sdk` to remove extraneous versions from your Cargo.lock
# file.
#
# There is a similar override in `programs/sbf/Cargo.toml`. Please keep both comments and the
# overrides in sync.
solana-program = { path = "sdk/program" }
Expand Down
7 changes: 7 additions & 0 deletions programs/sbf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,13 @@ targets = ["x86_64-unknown-linux-gnu"]
# and we end up with two versions of `solana-program` and `solana-zk-token-sdk` and all of their
# dependencies in our build tree.
#
# If you are developing downstream using non-crates-io solana-program (local or
# forked repo, or from github rev, eg), duplicate the following patch statements
# in your Cargo.toml. If you still hit duplicate-type errors with the patch
# statements in place, run `cargo update -p solana-program` and/or `cargo update
# -p solana-zk-token-sdk` to remove extraneous versions from your Cargo.lock
# file.
#
# There is a similar override in `../../Cargo.toml`. Please keep both comments and the
# overrides in sync.
solana-program = { path = "../../sdk/program" }
Expand Down

0 comments on commit e93725e

Please sign in to comment.