Skip to content

guix: remove cURL from build env #27779

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.

Sign up for GitHub

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

Jump to bottom
Merged
fanquake merged 1 commit into from
Jun 6, 2023
Merged

guix: remove cURL from build env #27779

fanquake merged 1 commit into from
Jun 6, 2023

Conversation

@fanquake
Copy link
Member

@fanquake fanquake commented May 30, 2023 •
edited
Loading

Remove cURL & osslsigncode option.

@DrahtBot
Copy link
Contributor

DrahtBot commented May 30, 2023 •
edited
Loading

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK hebasto, TheCharlatan

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@hebasto
Copy link
Member

hebasto commented May 30, 2023 •
edited
Loading

Concept ACK.

@hebasto
Copy link
Member

hebasto commented May 30, 2023

It is not clear why this is a fix. CMAKE_DISABLE_FIND_PACKAGE_CURL is a valid variable that:

can be used to build a project without an optional package

@hebasto
Copy link
Member

hebasto commented May 30, 2023

Btw, do we still need this line

bitcoin/contrib/guix/manifest.scm

Line 14 in f467b28

(gnu packages curl)
at all?

@DrahtBot
Copy link
Contributor

DrahtBot commented May 30, 2023

Guix builds

File commit f467b28
(master)		 commit 00dc9d5b6d1575aaeeb33af3789b36e4f90a3bfb
(master and this pull)
SHA256SUMS.part 5d14968a801f958b... 1db20fd9cd63d472...
*-aarch64-linux-gnu-debug.tar.gz 114c711218927b3f... d66848aa34bb1220...
*-aarch64-linux-gnu.tar.gz c8fc81e34ca263b2... 1924037d8c1afc6f...
*-arm-linux-gnueabihf-debug.tar.gz dfbb654b50acd1cd... 51d1ff706e84a0f8...
*-arm-linux-gnueabihf.tar.gz 12f1f1d62d8b50c8... 5ffa52e80413232c...
*-powerpc64-linux-gnu-debug.tar.gz ed6f78dbe3d4e95d... 8808f58f8dc0c7db...
*-powerpc64-linux-gnu.tar.gz 7cd4c8cfaee15702... 08e0ac809a87c455...
*-powerpc64le-linux-gnu-debug.tar.gz f0ec186bccfc8f31... 158f51c07bb639dd...
*-powerpc64le-linux-gnu.tar.gz b1e9e09ac261cd9f... 8516f2a3cc026da2...
*-riscv64-linux-gnu-debug.tar.gz 715615cb0eb83170... fa5100102d1567b8...
*-riscv64-linux-gnu.tar.gz bf83ae6b81874c68... 6f695aa0aa5e1041...
*-x86_64-linux-gnu-debug.tar.gz 971c811ff2e0dcb5... 68960e1fd3623276...
*-x86_64-linux-gnu.tar.gz 0094f69d73992a2d... b2129cb02903064b...
*.tar.gz 681a8417cd0f425f... fe4489ed296e6aff...
guix_build.log 0ef5b6b796a5d357... f7783dddf98519b8...
guix_build.log.diff a25fc54e9b38ee39...

@hebasto
Copy link
Member

hebasto commented Jun 1, 2023

It is not clear why this is a fix. CMAKE_DISABLE_FIND_PACKAGE_CURL is a valid variable that:

can be used to build a project without an optional package

Considering the FindCURL module source code, I believe that the current using of the CMAKE_DISABLE_FIND_PACKAGE_CURL variable is optimal.

FWIW, the build log contains -- Could NOT find CURL (missing: CURL_LIBRARY CURL_INCLUDE_DIR) for either variants. It is even possible to drop (arguments '(#:configure-flags ...)) altogether. But again, the current code in the master branch is the optimal shortcut.

@fanquake fanquake force-pushed the properly_disable_curl_osslsigncode branch from c998bfd to 641897a Compare June 2, 2023 15:36
@fanquake fanquake changed the title guix: fix CURL disable flag in osslsigncode guix: remove cURL from build env Jun 2, 2023
@fanquake
Copy link
Member Author

fanquake commented Jun 2, 2023

is the optimal shortcut.

I think I'd rather remove all the dead code. The option confusion comes from the fact that these flags seem to just fail silently if the relevant libraries haven't been compiled/installed with CMake, which I was look at for 2.6.

hebasto
hebasto approved these changes Jun 3, 2023
View reviewed changes
Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

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

ACK 641897a

Guix build:

7e9b3758aadd87db9c89fec5c05ca7a5020aaebf185daee4f7570dd1eeb23355  guix-build-641897a83dc9/output/aarch64-linux-gnu/SHA256SUMS.part
494f06d1f21ad20aa8cc8f61c4dfeda053215f41bb2aa0bfd47343909edf4dad  guix-build-641897a83dc9/output/aarch64-linux-gnu/bitcoin-641897a83dc9-aarch64-linux-gnu-debug.tar.gz
8a3912a0ff0cb41b87494291ca13bc9caa47ff08d57f37b6d99a9c8e3667390a  guix-build-641897a83dc9/output/aarch64-linux-gnu/bitcoin-641897a83dc9-aarch64-linux-gnu.tar.gz
f19438426160165aaf2b38f0dfb6ee1157789222094c263e8dbee16597a6e54a  guix-build-641897a83dc9/output/arm-linux-gnueabihf/SHA256SUMS.part
92dcc15477eb04a5a16f71eee084cb0d55ded62b9fa8b452a85b2aa44901d4a5  guix-build-641897a83dc9/output/arm-linux-gnueabihf/bitcoin-641897a83dc9-arm-linux-gnueabihf-debug.tar.gz
70a01778667dc0d6b364ab3013c6e0971fd12a1cc8222053390cae660ef463d4  guix-build-641897a83dc9/output/arm-linux-gnueabihf/bitcoin-641897a83dc9-arm-linux-gnueabihf.tar.gz
aa1f695501b520d39ba7c9dffc9d11ef1f28e3e8c1a73ca460148edef4937745  guix-build-641897a83dc9/output/arm64-apple-darwin/SHA256SUMS.part
7ca4c8dce214443fce181fdd1d299e7fdb084623c4f40abe273bf0a915bd3413  guix-build-641897a83dc9/output/arm64-apple-darwin/bitcoin-641897a83dc9-arm64-apple-darwin-unsigned.dmg
decd8b6a3e25faba192d5b305dbb55bdb1a263a7a034acfce209e96188df35df  guix-build-641897a83dc9/output/arm64-apple-darwin/bitcoin-641897a83dc9-arm64-apple-darwin-unsigned.tar.gz
a807d6597324b00753b8e69666ba0caf0cc42ef42125b88979f32a676024a356  guix-build-641897a83dc9/output/arm64-apple-darwin/bitcoin-641897a83dc9-arm64-apple-darwin.tar.gz
c262ce97ddba6599c27849b7a6d0d911ca43a84e36cb16d66537115b23f0f6ab  guix-build-641897a83dc9/output/dist-archive/bitcoin-641897a83dc9.tar.gz
0dceb5a7fef96a796066cfcb4a1ed6c42eec6e49c27fa58da3e4001347951e4d  guix-build-641897a83dc9/output/powerpc64-linux-gnu/SHA256SUMS.part
ffd89d8148e2fd7b7e9c5eeb9b5aa3c6ef516c993d863ae31cfd081d279cace9  guix-build-641897a83dc9/output/powerpc64-linux-gnu/bitcoin-641897a83dc9-powerpc64-linux-gnu-debug.tar.gz
ed4476ecf3d2bf3e97528466439c36b53c29ff6c536801802014c36d54b3df2f  guix-build-641897a83dc9/output/powerpc64-linux-gnu/bitcoin-641897a83dc9-powerpc64-linux-gnu.tar.gz
61dc2842797a67314f9993be99751a8d11fd54dcedeca26fa749bb4239f4b6cf  guix-build-641897a83dc9/output/powerpc64le-linux-gnu/SHA256SUMS.part
c08afb422c14c2efadc9dc677ff96cec415046205d36240b04928a5e37d66085  guix-build-641897a83dc9/output/powerpc64le-linux-gnu/bitcoin-641897a83dc9-powerpc64le-linux-gnu-debug.tar.gz
03c006460944d79a33db17771f250dc0d3a2f6ad776e6e828d470bbbd3e486fb  guix-build-641897a83dc9/output/powerpc64le-linux-gnu/bitcoin-641897a83dc9-powerpc64le-linux-gnu.tar.gz
9eacf7b79dacce548e0cfc488e24395e58f2f6ac720daf240720a5ff7f4022f0  guix-build-641897a83dc9/output/riscv64-linux-gnu/SHA256SUMS.part
c8b2512129717d97fd3f3a8e318e4fbd16b8f30a648499810ef78c1f4921c0dc  guix-build-641897a83dc9/output/riscv64-linux-gnu/bitcoin-641897a83dc9-riscv64-linux-gnu-debug.tar.gz
00f6924fd605e9cc570e558718d81276def828fa18cc5f7b91d2a1a5b9892e9b  guix-build-641897a83dc9/output/riscv64-linux-gnu/bitcoin-641897a83dc9-riscv64-linux-gnu.tar.gz
26a4ddc43073deab4262e97d80fc62d5d4ad631ab9a30a26348868d270815c5a  guix-build-641897a83dc9/output/x86_64-apple-darwin/SHA256SUMS.part
5e8da34fa268bf02aabb96429617666696bafa0b94b409492f8f25d5032e7523  guix-build-641897a83dc9/output/x86_64-apple-darwin/bitcoin-641897a83dc9-x86_64-apple-darwin-unsigned.dmg
976b79c3090defa1e8ae1c2f8e41093ecc6a73a31fa125abcae74cef8e0708c6  guix-build-641897a83dc9/output/x86_64-apple-darwin/bitcoin-641897a83dc9-x86_64-apple-darwin-unsigned.tar.gz
b94d9f00cd31637fd8dfe668716f086efeb63ec49d7b74927bdd9730fa1d3c5a  guix-build-641897a83dc9/output/x86_64-apple-darwin/bitcoin-641897a83dc9-x86_64-apple-darwin.tar.gz
dc0e65ec526c414b8ccebcbfa8ded492e3f27bbab8fb57108adf9c7663aa4d22  guix-build-641897a83dc9/output/x86_64-linux-gnu/SHA256SUMS.part
ba4f435ca40dc5e7c362e2a97261a859539b77163240a77c4287083a17b061d7  guix-build-641897a83dc9/output/x86_64-linux-gnu/bitcoin-641897a83dc9-x86_64-linux-gnu-debug.tar.gz
2bec39933491b20fc19629162a7023b6dc2cd8af764a9c0662727d7ec850eb60  guix-build-641897a83dc9/output/x86_64-linux-gnu/bitcoin-641897a83dc9-x86_64-linux-gnu.tar.gz
2081c799fa94f6780784d4211684a627de36b222841fe14383c87b1fa9df57e2  guix-build-641897a83dc9/output/x86_64-w64-mingw32/SHA256SUMS.part
dcebd386a4d58cfe88918c004c80874a3e4336fd86e7a02842ead8bd7351205d  guix-build-641897a83dc9/output/x86_64-w64-mingw32/bitcoin-641897a83dc9-win64-debug.zip
41bc2827c9cd9ef9a12c448497d0f1891ad4fa4c930651ecc9222ce959aeec1e  guix-build-641897a83dc9/output/x86_64-w64-mingw32/bitcoin-641897a83dc9-win64-setup-unsigned.exe
6ae282bb727627fbe4c56b21abdb3f1f8b223b3af01b1dbba234e1a7f3c440c7  guix-build-641897a83dc9/output/x86_64-w64-mingw32/bitcoin-641897a83dc9-win64-unsigned.tar.gz
d1a283fcec7faa8474fb3ea8b9102ce9b1bd41f0280a2813ea07ff2175153058  guix-build-641897a83dc9/output/x86_64-w64-mingw32/bitcoin-641897a83dc9-win64.zip

@hebasto hebasto mentioned this pull request Jun 3, 2023
Merged
sedited
sedited approved these changes Jun 5, 2023
View reviewed changes
Copy link
Contributor

@sedited sedited left a comment

Choose a reason for hiding this comment

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

ACK 641897a

Guix build:

find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
7e9b3758aadd87db9c89fec5c05ca7a5020aaebf185daee4f7570dd1eeb23355  guix-build-641897a83dc9/output/aarch64-linux-gnu/SHA256SUMS.part
494f06d1f21ad20aa8cc8f61c4dfeda053215f41bb2aa0bfd47343909edf4dad  guix-build-641897a83dc9/output/aarch64-linux-gnu/bitcoin-641897a83dc9-aarch64-linux-gnu-debug.tar.gz
8a3912a0ff0cb41b87494291ca13bc9caa47ff08d57f37b6d99a9c8e3667390a  guix-build-641897a83dc9/output/aarch64-linux-gnu/bitcoin-641897a83dc9-aarch64-linux-gnu.tar.gz
f19438426160165aaf2b38f0dfb6ee1157789222094c263e8dbee16597a6e54a  guix-build-641897a83dc9/output/arm-linux-gnueabihf/SHA256SUMS.part
92dcc15477eb04a5a16f71eee084cb0d55ded62b9fa8b452a85b2aa44901d4a5  guix-build-641897a83dc9/output/arm-linux-gnueabihf/bitcoin-641897a83dc9-arm-linux-gnueabihf-debug.tar.gz
70a01778667dc0d6b364ab3013c6e0971fd12a1cc8222053390cae660ef463d4  guix-build-641897a83dc9/output/arm-linux-gnueabihf/bitcoin-641897a83dc9-arm-linux-gnueabihf.tar.gz
aa1f695501b520d39ba7c9dffc9d11ef1f28e3e8c1a73ca460148edef4937745  guix-build-641897a83dc9/output/arm64-apple-darwin/SHA256SUMS.part
7ca4c8dce214443fce181fdd1d299e7fdb084623c4f40abe273bf0a915bd3413  guix-build-641897a83dc9/output/arm64-apple-darwin/bitcoin-641897a83dc9-arm64-apple-darwin-unsigned.dmg
decd8b6a3e25faba192d5b305dbb55bdb1a263a7a034acfce209e96188df35df  guix-build-641897a83dc9/output/arm64-apple-darwin/bitcoin-641897a83dc9-arm64-apple-darwin-unsigned.tar.gz
a807d6597324b00753b8e69666ba0caf0cc42ef42125b88979f32a676024a356  guix-build-641897a83dc9/output/arm64-apple-darwin/bitcoin-641897a83dc9-arm64-apple-darwin.tar.gz
c262ce97ddba6599c27849b7a6d0d911ca43a84e36cb16d66537115b23f0f6ab  guix-build-641897a83dc9/output/dist-archive/bitcoin-641897a83dc9.tar.gz
0dceb5a7fef96a796066cfcb4a1ed6c42eec6e49c27fa58da3e4001347951e4d  guix-build-641897a83dc9/output/powerpc64-linux-gnu/SHA256SUMS.part
ffd89d8148e2fd7b7e9c5eeb9b5aa3c6ef516c993d863ae31cfd081d279cace9  guix-build-641897a83dc9/output/powerpc64-linux-gnu/bitcoin-641897a83dc9-powerpc64-linux-gnu-debug.tar.gz
ed4476ecf3d2bf3e97528466439c36b53c29ff6c536801802014c36d54b3df2f  guix-build-641897a83dc9/output/powerpc64-linux-gnu/bitcoin-641897a83dc9-powerpc64-linux-gnu.tar.gz
61dc2842797a67314f9993be99751a8d11fd54dcedeca26fa749bb4239f4b6cf  guix-build-641897a83dc9/output/powerpc64le-linux-gnu/SHA256SUMS.part
c08afb422c14c2efadc9dc677ff96cec415046205d36240b04928a5e37d66085  guix-build-641897a83dc9/output/powerpc64le-linux-gnu/bitcoin-641897a83dc9-powerpc64le-linux-gnu-debug.tar.gz
03c006460944d79a33db17771f250dc0d3a2f6ad776e6e828d470bbbd3e486fb  guix-build-641897a83dc9/output/powerpc64le-linux-gnu/bitcoin-641897a83dc9-powerpc64le-linux-gnu.tar.gz
9eacf7b79dacce548e0cfc488e24395e58f2f6ac720daf240720a5ff7f4022f0  guix-build-641897a83dc9/output/riscv64-linux-gnu/SHA256SUMS.part
c8b2512129717d97fd3f3a8e318e4fbd16b8f30a648499810ef78c1f4921c0dc  guix-build-641897a83dc9/output/riscv64-linux-gnu/bitcoin-641897a83dc9-riscv64-linux-gnu-debug.tar.gz
00f6924fd605e9cc570e558718d81276def828fa18cc5f7b91d2a1a5b9892e9b  guix-build-641897a83dc9/output/riscv64-linux-gnu/bitcoin-641897a83dc9-riscv64-linux-gnu.tar.gz
26a4ddc43073deab4262e97d80fc62d5d4ad631ab9a30a26348868d270815c5a  guix-build-641897a83dc9/output/x86_64-apple-darwin/SHA256SUMS.part
5e8da34fa268bf02aabb96429617666696bafa0b94b409492f8f25d5032e7523  guix-build-641897a83dc9/output/x86_64-apple-darwin/bitcoin-641897a83dc9-x86_64-apple-darwin-unsigned.dmg
976b79c3090defa1e8ae1c2f8e41093ecc6a73a31fa125abcae74cef8e0708c6  guix-build-641897a83dc9/output/x86_64-apple-darwin/bitcoin-641897a83dc9-x86_64-apple-darwin-unsigned.tar.gz
b94d9f00cd31637fd8dfe668716f086efeb63ec49d7b74927bdd9730fa1d3c5a  guix-build-641897a83dc9/output/x86_64-apple-darwin/bitcoin-641897a83dc9-x86_64-apple-darwin.tar.gz
dc0e65ec526c414b8ccebcbfa8ded492e3f27bbab8fb57108adf9c7663aa4d22  guix-build-641897a83dc9/output/x86_64-linux-gnu/SHA256SUMS.part
ba4f435ca40dc5e7c362e2a97261a859539b77163240a77c4287083a17b061d7  guix-build-641897a83dc9/output/x86_64-linux-gnu/bitcoin-641897a83dc9-x86_64-linux-gnu-debug.tar.gz
2bec39933491b20fc19629162a7023b6dc2cd8af764a9c0662727d7ec850eb60  guix-build-641897a83dc9/output/x86_64-linux-gnu/bitcoin-641897a83dc9-x86_64-linux-gnu.tar.gz
2081c799fa94f6780784d4211684a627de36b222841fe14383c87b1fa9df57e2  guix-build-641897a83dc9/output/x86_64-w64-mingw32/SHA256SUMS.part
dcebd386a4d58cfe88918c004c80874a3e4336fd86e7a02842ead8bd7351205d  guix-build-641897a83dc9/output/x86_64-w64-mingw32/bitcoin-641897a83dc9-win64-debug.zip
41bc2827c9cd9ef9a12c448497d0f1891ad4fa4c930651ecc9222ce959aeec1e  guix-build-641897a83dc9/output/x86_64-w64-mingw32/bitcoin-641897a83dc9-win64-setup-unsigned.exe
6ae282bb727627fbe4c56b21abdb3f1f8b223b3af01b1dbba234e1a7f3c440c7  guix-build-641897a83dc9/output/x86_64-w64-mingw32/bitcoin-641897a83dc9-win64-unsigned.tar.gz
d1a283fcec7faa8474fb3ea8b9102ce9b1bd41f0280a2813ea07ff2175153058  guix-build-641897a83dc9/output/x86_64-w64-mingw32/bitcoin-641897a83dc9-win64.zip

@fanquake fanquake merged commit 8cc65f0 into bitcoin:master Jun 6, 2023
@fanquake fanquake deleted the properly_disable_curl_osslsigncode branch June 6, 2023 09:41
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jun 7, 2023
@fanquake
Merge bitcoin#27779: guix: remove cURL from build env
f25efa4 
641897a guix: remove cURL from build env (fanquake)

Pull request description:

  Remove cURL & osslsigncode option.

ACKs for top commit:
  hebasto:
    ACK 641897a
  TheCharlatan:
    ACK 641897a

Tree-SHA512: f917afe5aaffa8436009c63ace4a78ed3bc8a13fffeb12db2c12204f603fbd05f975f798c1bccaefa22b6131c91415477c115921dfe89f8fa064aab82bcd4a6f
Fabcien pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Feb 1, 2024
@fanquake @PiRK
guix: remove cURL from build env
5735640 
Summary: This is a backport of [[bitcoin/bitcoin#27779 | core#27779]]

Test Plan: `contrib/guix/guix-build`

Reviewers: #bitcoin_abc, Fabien

Reviewed By: #bitcoin_abc, Fabien

Differential Revision: https://reviews.bitcoinabc.org/D15344
@bitcoin bitcoin locked and limited conversation to collaborators Jun 5, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@sedited sedited sedited approved these changes

@hebasto hebasto hebasto approved these changes

Assignees

No one assigned

Labels

Windows

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@fanquake @DrahtBot @hebasto @sedited