Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

secp256k1-sys: update util.h patch to delete more stdio code #735

Merged
merged 1 commit into from
Sep 10, 2024

Conversation

apoelstra
Copy link
Member

Fixes #734

Copy link
Member Author

@apoelstra apoelstra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully ran local tests on b66bae7.

Copy link
Collaborator

@Kixunil Kixunil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK b66bae7

@Kixunil
Copy link
Collaborator

Kixunil commented Sep 10, 2024

I wonder if upstream maintainers would be open to cleaning this up on their end so that we wouldn't need these potentially-fragile patches.

@apoelstra
Copy link
Member Author

I think so -- they have the USE_EXTERNAL_DEFAULT_CALLBACKS config flag which disables most of the stdio-calling code, for example. And that was largely at our request.

In this case, they added this code which isn't even used! (Its purpose is to make debugging/development easier.) I'm sure it was just an oversight that it could potentially break no-libc users.

@apoelstra apoelstra merged commit 18654c3 into rust-bitcoin:master Sep 10, 2024
30 checks passed
@apoelstra apoelstra deleted the 2024-09--more-stdio branch September 10, 2024 17:28
@apoelstra
Copy link
Member Author

Needs backport.

apoelstra added a commit that referenced this pull request Sep 11, 2024
21f67d5 secp256k1-sys: release 0.10.1 (Andrew Poelstra)
1f9f77b secp256k1-sys: update util.h patch to delete more stdio code (Andrew Poelstra)

Pull request description:

  This backports #735. I am PR'ing to the secp256k1-0.29.x branch because this will work and because it feels like unnecessary complication to try to create a secp256k1-sys-0.10.x branch, which might be "more correct" but would make our git tree harder to understand and maintain.

  As in #735, this just deletes some dead code from secp256k1-sys/depend/secp256k1.

ACKs for top commit:
  Kixunil:
    ACK 21f67d5

Tree-SHA512: 1b88cf2458250d1454696aabc7c85d76337033ac056deb9416f1487eefb504d01c627849b477f68438cf520242cbdef9de89aadb9dbe9f79c94244ce6c8348bf
apoelstra added a commit to apoelstra/rust-secp256k1 that referenced this pull request Oct 8, 2024
We could release a new secp256k1-sys at the same time, but we have made
no changes there except to delete a bit of unused code in rust-bitcoin#735, and bump
MSRV, so it does not seem worth the extra disruption.
apoelstra added a commit that referenced this pull request Oct 9, 2024
228f98e release secp256k1 0.30.0 (Andrew Poelstra)

Pull request description:

  We could release a new secp256k1-sys at the same time, but we have made no changes there except to delete a bit of unused code in #735, and bump MSRV, so it does not seem worth the extra disruption.

ACKs for top commit:
  tcharding:
    ACK 228f98e

Tree-SHA512: af3d091f8a1a8efa0e38e7d45504b5ccabc73b783a15f26102c92e7a83d1048df27a14e64aae079b523c66004eb9b0ff33495763743b5d18762bc3dfcda00fbd
apoelstra added a commit to BlockstreamResearch/rust-secp256k1-zkp that referenced this pull request Oct 18, 2024
454a9aa fix: Wasm doesn't build (Christian Lewe)

Pull request description:

  Port of rust-bitcoin/rust-secp256k1#735

  Let's see if this passes CI. I can run `cargo build --target wasm32-unknown-unknown` after my commit.

  Generating the `.patch` files was kind of hard. Is there an easy way?

ACKs for top commit:
  apoelstra:
    ACK 454a9aa; successfully ran local tests; thanks!!

Tree-SHA512: 84c41aed6ba8a592938e1888fccf0abcc09fc71a052c6616cb6e63f89474f8cf99e65058e07c2c992298cabd5e2fa6d5e7a3a9b3fc1fb14bb13800f8b1c01b00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

secp256k1-sys cannot be cross compiled using rust cross.
2 participants