Skip to content

Conversation

@fanquake
Copy link
Member

@fanquake fanquake commented Oct 11, 2022

Move util/url to common/url.

Also add missing event_* flags to libbitcoin_util. #26293 + the commit dropping boost cppflags from libbitcoin_util shows this issue. i.e:

  CXX      util/libbitcoin_util_a-url.o
util/url.cpp:7:10: fatal error: 'event2/http.h' file not found
#include <event2/http.h>
         ^~~~~~~~~~~~~~~
1 error generated.

@theuni
Copy link
Member

theuni commented Oct 11, 2022

Hmm, going by the other conversations about util vs common, doesn't util/url.cpp belong in common as it's required by the binaries but not the kernel?

@jarolrod
Copy link
Contributor

jarolrod commented Oct 12, 2022

guix hashes

x86:

28d965c830a9c2d9fae1f1f9ee2d9b9f7bfea0d86f7e6f4b8099d64c0a4146a7  guix-build-44a3fa429f66/output/aarch64-linux-gnu/SHA256SUMS.part
e0c3d026aa506e457fa340e98640aefedaa96e1880870bd9a66ad50db8385709  guix-build-44a3fa429f66/output/aarch64-linux-gnu/bitcoin-44a3fa429f66-aarch64-linux-gnu-debug.tar.gz
f9d25430009c2c317d15bba6683147b7c01095ff7c83fd9fb1757247e8d7d719  guix-build-44a3fa429f66/output/aarch64-linux-gnu/bitcoin-44a3fa429f66-aarch64-linux-gnu.tar.gz
7912c71875aab4abd25aebbc06b26e68791d051a64f09fea43ecd4e5ae3ac176  guix-build-44a3fa429f66/output/arm-linux-gnueabihf/SHA256SUMS.part
7f27d55e4fccc48d040f552eb7b65f6de57e4947f39c2f1f3ed9365e07f94af8  guix-build-44a3fa429f66/output/arm-linux-gnueabihf/bitcoin-44a3fa429f66-arm-linux-gnueabihf-debug.tar.gz
200938e720ee9e1241504c454f6d803ef4df33aa49bb2d9516f2b60209c3eadf  guix-build-44a3fa429f66/output/arm-linux-gnueabihf/bitcoin-44a3fa429f66-arm-linux-gnueabihf.tar.gz
a57a19f578757c508a5712d901ece3e995089d5247f965037da85022f19652fb  guix-build-44a3fa429f66/output/arm64-apple-darwin/SHA256SUMS.part
9ddd9164616b03ccef5e828053fb1d71542973490d8fc83fc7c9806890bca6b5  guix-build-44a3fa429f66/output/arm64-apple-darwin/bitcoin-44a3fa429f66-arm64-apple-darwin-unsigned.dmg
ec4b7987bf5e31c6ca605ee860ea8a9bb4959651665af3950cae27fa7a10b242  guix-build-44a3fa429f66/output/arm64-apple-darwin/bitcoin-44a3fa429f66-arm64-apple-darwin-unsigned.tar.gz
8c16da5d2e051b73c53393afed953ed16b34260ffb452f99502242170e31aa37  guix-build-44a3fa429f66/output/arm64-apple-darwin/bitcoin-44a3fa429f66-arm64-apple-darwin.tar.gz
fd9973f393314c5f5d30664d30fd886683d63e3e80e2c1eb17852d506ad658a5  guix-build-44a3fa429f66/output/dist-archive/bitcoin-44a3fa429f66.tar.gz
fe3fcbbcf07e73a2bb8f61d59f30f5d88ed77d5fa21dd7c49f183f535868b9c9  guix-build-44a3fa429f66/output/powerpc64-linux-gnu/SHA256SUMS.part
6e6cd1b98397c92ac5344d98fb90ce5bd0dce7b876e928e3cc878c32faabd989  guix-build-44a3fa429f66/output/powerpc64-linux-gnu/bitcoin-44a3fa429f66-powerpc64-linux-gnu-debug.tar.gz
2c968184cf5a8bd82994e38796e2994ceaf8b3efc30fb7fed685a00179e81175  guix-build-44a3fa429f66/output/powerpc64-linux-gnu/bitcoin-44a3fa429f66-powerpc64-linux-gnu.tar.gz
7f291d4d595a981976118662cb5a486063e72f3280b80afb5a678f307bac3511  guix-build-44a3fa429f66/output/powerpc64le-linux-gnu/SHA256SUMS.part
db38366cd4f8f334e51f9cd0a3ac9bfb17c3f5e63a2771ff577661fe94e4cb2c  guix-build-44a3fa429f66/output/powerpc64le-linux-gnu/bitcoin-44a3fa429f66-powerpc64le-linux-gnu-debug.tar.gz
a77d415861ebbb3edd670f3a70cc14c86914a7c8c40640ea6528b47452687911  guix-build-44a3fa429f66/output/powerpc64le-linux-gnu/bitcoin-44a3fa429f66-powerpc64le-linux-gnu.tar.gz
4cbb51b3e3d507b032ee54fd7172734893f9a89ed68a3ca82828725bd953ee15  guix-build-44a3fa429f66/output/riscv64-linux-gnu/SHA256SUMS.part
79e5b38046c1821e233b27e7a8fe2ca768732ad4ddeb70f665379e7ffb658b68  guix-build-44a3fa429f66/output/riscv64-linux-gnu/bitcoin-44a3fa429f66-riscv64-linux-gnu-debug.tar.gz
f7974847da0f66f1b826ce984aad477ddbc3923083b5f7bfaabdc18774e30e08  guix-build-44a3fa429f66/output/riscv64-linux-gnu/bitcoin-44a3fa429f66-riscv64-linux-gnu.tar.gz
43653df487eeb1a95244e28e3fc935eac1820c9ed71d0a5393218f5641da2eab  guix-build-44a3fa429f66/output/x86_64-apple-darwin/SHA256SUMS.part
d6b6d6c086a954f5ba11c38b64b72852162d8279d23f7519aa9c0eefbad05b1e  guix-build-44a3fa429f66/output/x86_64-apple-darwin/bitcoin-44a3fa429f66-x86_64-apple-darwin-unsigned.dmg
c2fa5c49c6755aa1b9f2e0fce20b9935a542b5d338375e420936e1f47cdbc8ba  guix-build-44a3fa429f66/output/x86_64-apple-darwin/bitcoin-44a3fa429f66-x86_64-apple-darwin-unsigned.tar.gz
d6241df01dd37995bac4afaf2823b9803a58703976f65c0ece57a38d5b093411  guix-build-44a3fa429f66/output/x86_64-apple-darwin/bitcoin-44a3fa429f66-x86_64-apple-darwin.tar.gz
46972173f19930f0cb5dd512f4c82b9174d3c519c9f9c2ef079817a2739c3d81  guix-build-44a3fa429f66/output/x86_64-linux-gnu/SHA256SUMS.part
7ce736910ec767dce94e7de4dc9268f9f9d8479848769782091739ae82952e3d  guix-build-44a3fa429f66/output/x86_64-linux-gnu/bitcoin-44a3fa429f66-x86_64-linux-gnu-debug.tar.gz
5b5d7e64964bac57dd11e29efab2f4a22b9f55f12ec568e6be999c952a562bee  guix-build-44a3fa429f66/output/x86_64-linux-gnu/bitcoin-44a3fa429f66-x86_64-linux-gnu.tar.gz
d02f1ba20d62fd6d86fb0ecd4fbcf79b8a246cc0a95e50f6b4ff55bd20fc9ce9  guix-build-44a3fa429f66/output/x86_64-w64-mingw32/SHA256SUMS.part
b7d1bb619a5668b59061d19f5a969db65b07832fe96a7a77c5ea5f8c181152fc  guix-build-44a3fa429f66/output/x86_64-w64-mingw32/bitcoin-44a3fa429f66-win64-debug.zip
bada8f9629510b47ede617e04f484002b28b9483c68938e9d8cad69e0e83603a  guix-build-44a3fa429f66/output/x86_64-w64-mingw32/bitcoin-44a3fa429f66-win64-setup-unsigned.exe
fbce3735901526f1fad7943326d537639dd9f154bf88f05cb1df98e8072b298b  guix-build-44a3fa429f66/output/x86_64-w64-mingw32/bitcoin-44a3fa429f66-win64-unsigned.tar.gz
dd2455b8ff8ecce72aca3d54c44491b905d1898558735a2df469257d8fb7bd5d  guix-build-44a3fa429f66/output/x86_64-w64-mingw32/bitcoin-44a3fa429f66-win64.zip

arm64:

28d965c830a9c2d9fae1f1f9ee2d9b9f7bfea0d86f7e6f4b8099d64c0a4146a7  guix-build-44a3fa429f66/output/aarch64-linux-gnu/SHA256SUMS.part
e0c3d026aa506e457fa340e98640aefedaa96e1880870bd9a66ad50db8385709  guix-build-44a3fa429f66/output/aarch64-linux-gnu/bitcoin-44a3fa429f66-aarch64-linux-gnu-debug.tar.gz
f9d25430009c2c317d15bba6683147b7c01095ff7c83fd9fb1757247e8d7d719  guix-build-44a3fa429f66/output/aarch64-linux-gnu/bitcoin-44a3fa429f66-aarch64-linux-gnu.tar.gz
7912c71875aab4abd25aebbc06b26e68791d051a64f09fea43ecd4e5ae3ac176  guix-build-44a3fa429f66/output/arm-linux-gnueabihf/SHA256SUMS.part
7f27d55e4fccc48d040f552eb7b65f6de57e4947f39c2f1f3ed9365e07f94af8  guix-build-44a3fa429f66/output/arm-linux-gnueabihf/bitcoin-44a3fa429f66-arm-linux-gnueabihf-debug.tar.gz
200938e720ee9e1241504c454f6d803ef4df33aa49bb2d9516f2b60209c3eadf  guix-build-44a3fa429f66/output/arm-linux-gnueabihf/bitcoin-44a3fa429f66-arm-linux-gnueabihf.tar.gz
a57a19f578757c508a5712d901ece3e995089d5247f965037da85022f19652fb  guix-build-44a3fa429f66/output/arm64-apple-darwin/SHA256SUMS.part
9ddd9164616b03ccef5e828053fb1d71542973490d8fc83fc7c9806890bca6b5  guix-build-44a3fa429f66/output/arm64-apple-darwin/bitcoin-44a3fa429f66-arm64-apple-darwin-unsigned.dmg
ec4b7987bf5e31c6ca605ee860ea8a9bb4959651665af3950cae27fa7a10b242  guix-build-44a3fa429f66/output/arm64-apple-darwin/bitcoin-44a3fa429f66-arm64-apple-darwin-unsigned.tar.gz
8c16da5d2e051b73c53393afed953ed16b34260ffb452f99502242170e31aa37  guix-build-44a3fa429f66/output/arm64-apple-darwin/bitcoin-44a3fa429f66-arm64-apple-darwin.tar.gz
fd9973f393314c5f5d30664d30fd886683d63e3e80e2c1eb17852d506ad658a5  guix-build-44a3fa429f66/output/dist-archive/bitcoin-44a3fa429f66.tar.gz
fe3fcbbcf07e73a2bb8f61d59f30f5d88ed77d5fa21dd7c49f183f535868b9c9  guix-build-44a3fa429f66/output/powerpc64-linux-gnu/SHA256SUMS.part
6e6cd1b98397c92ac5344d98fb90ce5bd0dce7b876e928e3cc878c32faabd989  guix-build-44a3fa429f66/output/powerpc64-linux-gnu/bitcoin-44a3fa429f66-powerpc64-linux-gnu-debug.tar.gz
2c968184cf5a8bd82994e38796e2994ceaf8b3efc30fb7fed685a00179e81175  guix-build-44a3fa429f66/output/powerpc64-linux-gnu/bitcoin-44a3fa429f66-powerpc64-linux-gnu.tar.gz
7f291d4d595a981976118662cb5a486063e72f3280b80afb5a678f307bac3511  guix-build-44a3fa429f66/output/powerpc64le-linux-gnu/SHA256SUMS.part
db38366cd4f8f334e51f9cd0a3ac9bfb17c3f5e63a2771ff577661fe94e4cb2c  guix-build-44a3fa429f66/output/powerpc64le-linux-gnu/bitcoin-44a3fa429f66-powerpc64le-linux-gnu-debug.tar.gz
a77d415861ebbb3edd670f3a70cc14c86914a7c8c40640ea6528b47452687911  guix-build-44a3fa429f66/output/powerpc64le-linux-gnu/bitcoin-44a3fa429f66-powerpc64le-linux-gnu.tar.gz
4cbb51b3e3d507b032ee54fd7172734893f9a89ed68a3ca82828725bd953ee15  guix-build-44a3fa429f66/output/riscv64-linux-gnu/SHA256SUMS.part
79e5b38046c1821e233b27e7a8fe2ca768732ad4ddeb70f665379e7ffb658b68  guix-build-44a3fa429f66/output/riscv64-linux-gnu/bitcoin-44a3fa429f66-riscv64-linux-gnu-debug.tar.gz
f7974847da0f66f1b826ce984aad477ddbc3923083b5f7bfaabdc18774e30e08  guix-build-44a3fa429f66/output/riscv64-linux-gnu/bitcoin-44a3fa429f66-riscv64-linux-gnu.tar.gz
43653df487eeb1a95244e28e3fc935eac1820c9ed71d0a5393218f5641da2eab  guix-build-44a3fa429f66/output/x86_64-apple-darwin/SHA256SUMS.part
d6b6d6c086a954f5ba11c38b64b72852162d8279d23f7519aa9c0eefbad05b1e  guix-build-44a3fa429f66/output/x86_64-apple-darwin/bitcoin-44a3fa429f66-x86_64-apple-darwin-unsigned.dmg
c2fa5c49c6755aa1b9f2e0fce20b9935a542b5d338375e420936e1f47cdbc8ba  guix-build-44a3fa429f66/output/x86_64-apple-darwin/bitcoin-44a3fa429f66-x86_64-apple-darwin-unsigned.tar.gz
d6241df01dd37995bac4afaf2823b9803a58703976f65c0ece57a38d5b093411  guix-build-44a3fa429f66/output/x86_64-apple-darwin/bitcoin-44a3fa429f66-x86_64-apple-darwin.tar.gz
46972173f19930f0cb5dd512f4c82b9174d3c519c9f9c2ef079817a2739c3d81  guix-build-44a3fa429f66/output/x86_64-linux-gnu/SHA256SUMS.part
7ce736910ec767dce94e7de4dc9268f9f9d8479848769782091739ae82952e3d  guix-build-44a3fa429f66/output/x86_64-linux-gnu/bitcoin-44a3fa429f66-x86_64-linux-gnu-debug.tar.gz
5b5d7e64964bac57dd11e29efab2f4a22b9f55f12ec568e6be999c952a562bee  guix-build-44a3fa429f66/output/x86_64-linux-gnu/bitcoin-44a3fa429f66-x86_64-linux-gnu.tar.gz
d02f1ba20d62fd6d86fb0ecd4fbcf79b8a246cc0a95e50f6b4ff55bd20fc9ce9  guix-build-44a3fa429f66/output/x86_64-w64-mingw32/SHA256SUMS.part
b7d1bb619a5668b59061d19f5a969db65b07832fe96a7a77c5ea5f8c181152fc  guix-build-44a3fa429f66/output/x86_64-w64-mingw32/bitcoin-44a3fa429f66-win64-debug.zip
bada8f9629510b47ede617e04f484002b28b9483c68938e9d8cad69e0e83603a  guix-build-44a3fa429f66/output/x86_64-w64-mingw32/bitcoin-44a3fa429f66-win64-setup-unsigned.exe
fbce3735901526f1fad7943326d537639dd9f154bf88f05cb1df98e8072b298b  guix-build-44a3fa429f66/output/x86_64-w64-mingw32/bitcoin-44a3fa429f66-win64-unsigned.tar.gz
dd2455b8ff8ecce72aca3d54c44491b905d1898558735a2df469257d8fb7bd5d  guix-build-44a3fa429f66/output/x86_64-w64-mingw32/bitcoin-44a3fa429f66-win64.zip

@fanquake
Copy link
Member Author

Hmm, going by the other conversations about util vs common, doesn't util/url.cpp belong in common as it's required by the binaries but not the kernel?

We may ultimately end up moving it there, but I'd rather keep this PR to just adding the adding / consolidating the missing flags (which are touching libs other than common/util), rather than bundling in shuffling too. Happy to discuss / move code in a follow up.

@theuni
Copy link
Member

theuni commented Oct 12, 2022

Ok. I was thinking it would make sense to put them in the right place first, but sure, it also makes sense to fix things as-is and ensure consistency before moving.

I'm not sure about the need to add EVENT_PTHREADS_LIBS where they're missing though. I think we only need to link that if we're calling the evthread_* functions, which are only used in torcontrol.cpp and httpserver.cpp.

@theuni
Copy link
Member

theuni commented Oct 13, 2022

I'm not sure about the need to add EVENT_PTHREADS_LIBS where they're missing though. I think we only need to link that if we're calling the evthread_* functions, which are only used in torcontrol.cpp and httpserver.cpp.

Same for EVENT_PTHREADS_CFLAGS btw.

@fanquake fanquake changed the title build: fix EVENT_* flags usage build: move util/url to common/url Oct 24, 2022
@fanquake fanquake force-pushed the cleanup_event_flags branch from 44a3fa4 to 934da86 Compare October 24, 2022 01:58
@fanquake
Copy link
Member Author

Ok. I was thinking it would make sense to put them in the right place first,

Doing this now.

@DrahtBot
Copy link
Contributor

DrahtBot commented Oct 24, 2022

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #26292 (util: move threadinterrupt into util/ by fanquake)
  • #26082 (RPC/Wallet: Access wallets via interfaces::Wallet by luke-jr)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@fanquake fanquake force-pushed the cleanup_event_flags branch from 5589370 to 5b68bd6 Compare October 31, 2022 09:35
The fact that this is missing is currently masked by the inclusion of
BOOST_CPPFLAGS.
@fanquake fanquake force-pushed the cleanup_event_flags branch from 5b68bd6 to 3a0b352 Compare October 31, 2022 10:17
@sipsorcery
Copy link
Contributor

Fwiw msvc build works for this PR.

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 3a0b352

@fanquake fanquake requested a review from theuni October 31, 2022 16:14
Copy link
Contributor

@ryanofsky ryanofsky left a comment

Choose a reason for hiding this comment

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

Code review ACK 3a0b352

fanquake added a commit to bitcoin-core/gui that referenced this pull request Nov 1, 2022
3a0b352 refactor: move url.h/cpp from lib util to lib common (fanquake)
058eb69 build: add missing event cflags to libbitcoin_util (fanquake)

Pull request description:

  Move `util/url` to `common/url`.

  Also add missing `event_*` flags to `libbitcoin_util`. #26293 + the commit dropping boost cppflags from `libbitcoin_util` shows this issue. i.e:
  ```bash
    CXX      util/libbitcoin_util_a-url.o
  util/url.cpp:7:10: fatal error: 'event2/http.h' file not found
  #include <event2/http.h>
           ^~~~~~~~~~~~~~~
  1 error generated.
  ```

ACKs for top commit:
  hebasto:
    ACK 3a0b352
  ryanofsky:
    Code review ACK 3a0b352

Tree-SHA512: 600a76fd334267a02d332df9b67891a38d3fd7f5baf8a82b2447879b3bc65eab2552d2c081c0a5f1ec927bf80df7fc1f0cbbdda4cb76994b46dadf260b8e1cb3
@fanquake
Copy link
Member Author

fanquake commented Nov 1, 2022

This has been merged.

@fanquake fanquake closed this Nov 1, 2022
@fanquake fanquake deleted the cleanup_event_flags branch November 1, 2022 10:07
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Nov 1, 2022
@bitcoin bitcoin locked and limited conversation to collaborators Nov 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants