Skip to content

build: Do not define ENABLE_ZMQ when ZMQ is not available #27696

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
May 22, 2023
Merged

build: Do not define ENABLE_ZMQ when ZMQ is not available #27696

fanquake merged 1 commit into from
May 22, 2023

Conversation

@hebasto
Copy link
Member

@hebasto hebasto commented May 18, 2023 •
edited
Loading

A new behavior is consistent with the other optional dependencies.

The source code contains #if ENABLE_ZMQ lines only:

$ git grep ENABLE_ZMQ -- src/*.cpp
src/init.cpp:#if ENABLE_ZMQ
src/init.cpp:#if ENABLE_ZMQ
src/init.cpp:#if ENABLE_ZMQ
src/init.cpp:#if ENABLE_ZMQ
src/init.cpp:#if ENABLE_ZMQ

Change in description line -- "Define to 1..." --> "Define this symbol.." -- is motivated by the fact that the actual value of the defined ENABLE_ZMQ macro does not matter at all.

Related to:

@hebasto
build: Do not define ENABLE_ZMQ when ZMQ is not available
fa5831b 
A new behavior is consistent with the other optional dependencies.

The source code contains `#if ENABLE_ZMQ` lines only.
@DrahtBot
Copy link
Contributor

DrahtBot commented May 18, 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 TheCharlatan, jarolrod

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

@hebasto hebasto mentioned this pull request May 18, 2023
Closed
@fanquake fanquake requested a review from sedited May 19, 2023 12:28
sedited
sedited approved these changes May 21, 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 fa5831b

Verified that the symbol is not defined when zmq is not available in config.status.

@jarolrod
Copy link
Contributor

jarolrod commented May 22, 2023

hashes:

7091c64cada36ec2850f889978ae5fdc3cf4f28ec40bfb1fd16100c3f502fe6e  guix-build-fa5831bd6f94/output/aarch64-linux-gnu/SHA256SUMS.part
e3b87e22e4cbd7a50aac4d5c982c12dd5b3f224ff4f9543dd3c331d424899287  guix-build-fa5831bd6f94/output/aarch64-linux-gnu/bitcoin-fa5831bd6f94-aarch64-linux-gnu-debug.tar.gz
96ffa1075a4b1d14c842bb8a5f5106cdb8f401eb173578c7376f6454b918e4eb  guix-build-fa5831bd6f94/output/aarch64-linux-gnu/bitcoin-fa5831bd6f94-aarch64-linux-gnu.tar.gz
1bbe3a56784762b811eadce056849ca24502f34e3622c59dd7f73d84ecc475a6  guix-build-fa5831bd6f94/output/arm-linux-gnueabihf/SHA256SUMS.part
f8126f1090e0cd0da5edd492840f7661d9a47c4649024ffc4673d58ac4c19ea0  guix-build-fa5831bd6f94/output/arm-linux-gnueabihf/bitcoin-fa5831bd6f94-arm-linux-gnueabihf-debug.tar.gz
5436c0c6e019ae61a5e92f41701e2dbd3b79a8be14edd0eaea48c5d09c348ec1  guix-build-fa5831bd6f94/output/arm-linux-gnueabihf/bitcoin-fa5831bd6f94-arm-linux-gnueabihf.tar.gz
65e6552abd91b69a7b1aea0dc90150b44d9ccdb6ee0af97f057c601706372014  guix-build-fa5831bd6f94/output/arm64-apple-darwin/SHA256SUMS.part
054a90dcc0d0051522ffbcb90a2d7a82433d0d9eb41b2e483086342ca992447b  guix-build-fa5831bd6f94/output/arm64-apple-darwin/bitcoin-fa5831bd6f94-arm64-apple-darwin-unsigned.dmg
3f1d8b4b1efd360ba426e7aa0bda41ccb73ad6bd14c4613faabb32ed008f6a66  guix-build-fa5831bd6f94/output/arm64-apple-darwin/bitcoin-fa5831bd6f94-arm64-apple-darwin-unsigned.tar.gz
1ff15ea7ba7a5933549e0b0fa533c37fa808f4410acbdf1ceb07be16e0ae5272  guix-build-fa5831bd6f94/output/arm64-apple-darwin/bitcoin-fa5831bd6f94-arm64-apple-darwin.tar.gz
9a156adb382142a6a0423cea432be7f0e15522b30b2e785edac185093dc93af8  guix-build-fa5831bd6f94/output/dist-archive/bitcoin-fa5831bd6f94.tar.gz
7870e1918dbb94ed61a73ef8b448538a99fbbf71c30e9ee76942ae0b208c05c7  guix-build-fa5831bd6f94/output/powerpc64-linux-gnu/SHA256SUMS.part
0b27d4e2004804d31fffea933c54f3c890eff8eced66cab537c7361cfc8f4030  guix-build-fa5831bd6f94/output/powerpc64-linux-gnu/bitcoin-fa5831bd6f94-powerpc64-linux-gnu-debug.tar.gz
1c5ef4da76a5da7ccade4c268a2e3642e73dbf90c8335270c78c7784f05d4ed9  guix-build-fa5831bd6f94/output/powerpc64-linux-gnu/bitcoin-fa5831bd6f94-powerpc64-linux-gnu.tar.gz
10d1772badec14bb386e8a8f94cb52a11fbe7f8998a977e03a655f84f87c959d  guix-build-fa5831bd6f94/output/powerpc64le-linux-gnu/SHA256SUMS.part
dbad63b3761e3d44f8ca63df64ce2bcea18089fad0840132fc0380e7507ce320  guix-build-fa5831bd6f94/output/powerpc64le-linux-gnu/bitcoin-fa5831bd6f94-powerpc64le-linux-gnu-debug.tar.gz
6174e1baa088194f380da89eebf86afc4430e7f8b7f3f86825bebc578823d8d9  guix-build-fa5831bd6f94/output/powerpc64le-linux-gnu/bitcoin-fa5831bd6f94-powerpc64le-linux-gnu.tar.gz
c88d14e96a960a990d660b539805797620e19f30c0b7cf43b9e0a89646bfe8c3  guix-build-fa5831bd6f94/output/riscv64-linux-gnu/SHA256SUMS.part
1797d792e69a05fc8636d7ac34c618cf3f0881cfb388e48235ba6fdd097fc495  guix-build-fa5831bd6f94/output/riscv64-linux-gnu/bitcoin-fa5831bd6f94-riscv64-linux-gnu-debug.tar.gz
c8bd9cbd06ee6732e694d3151a901375983126be787128f91d33a1b354a2d760  guix-build-fa5831bd6f94/output/riscv64-linux-gnu/bitcoin-fa5831bd6f94-riscv64-linux-gnu.tar.gz
60ea9244ad189256f983d6fcef0f5236837db3aebccc03551e6c1c96cb7d4b4f  guix-build-fa5831bd6f94/output/x86_64-apple-darwin/SHA256SUMS.part
1a5ecb7c2cd3d3df297bbf0ac2f3d31c8a175f23ec469b7c467cf2fdb910b2ca  guix-build-fa5831bd6f94/output/x86_64-apple-darwin/bitcoin-fa5831bd6f94-x86_64-apple-darwin-unsigned.dmg
dc5d68a127ab55238c0e7f50ddab91b805fbc860b56efcf02ec9c3bbb496e9e5  guix-build-fa5831bd6f94/output/x86_64-apple-darwin/bitcoin-fa5831bd6f94-x86_64-apple-darwin-unsigned.tar.gz
571de9aaa08229cd12b32eb7e1c40c9eb4b14558df32f8d7c5609cc42581faec  guix-build-fa5831bd6f94/output/x86_64-apple-darwin/bitcoin-fa5831bd6f94-x86_64-apple-darwin.tar.gz
f74c8f125a340978e90a7222453b8164936ee5ceef67f90a05d74eee4af78b10  guix-build-fa5831bd6f94/output/x86_64-linux-gnu/SHA256SUMS.part
5754a6ea8bf74794806b1e2438971f090f0fafc10a10af16d3365a415bb82623  guix-build-fa5831bd6f94/output/x86_64-linux-gnu/bitcoin-fa5831bd6f94-x86_64-linux-gnu-debug.tar.gz
fcf96d48fc7badfa6e7237cd5e1baf8f904bdae3c5cef4515410beef197aa0a7  guix-build-fa5831bd6f94/output/x86_64-linux-gnu/bitcoin-fa5831bd6f94-x86_64-linux-gnu.tar.gz
4f1117782b5926876e5557685c51df76795072c1558423ce914ef9d9ff18017e  guix-build-fa5831bd6f94/output/x86_64-w64-mingw32/SHA256SUMS.part
f1fa73d4b9e3d23ddfa1ef1589d1fff06125dfdbae3e8dc55bf07af0994a1909  guix-build-fa5831bd6f94/output/x86_64-w64-mingw32/bitcoin-fa5831bd6f94-win64-debug.zip
137a93d9c530de94bf9a888142ae3b2b3eed61c5208a97391cf252cb33acc9c1  guix-build-fa5831bd6f94/output/x86_64-w64-mingw32/bitcoin-fa5831bd6f94-win64-setup-unsigned.exe
a46fc4764953b5aa3556c026ca847c9307629d68fb4168f4aa0ea8799ef2297f  guix-build-fa5831bd6f94/output/x86_64-w64-mingw32/bitcoin-fa5831bd6f94-win64-unsigned.tar.gz
74ec6b8231ba49c2191d82514f063f4c71f2f3ed991ee80a7f0b15fa7e1d516e  guix-build-fa5831bd6f94/output/x86_64-w64-mingw32/bitcoin-fa5831bd6f94-win64.zip```

jarolrod
jarolrod approved these changes May 22, 2023
View reviewed changes
Copy link
Contributor

@jarolrod jarolrod left a comment

Choose a reason for hiding this comment

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

ACK fa5831b

@fanquake fanquake merged commit a106a86 into bitcoin:master May 22, 2023
@hebasto hebasto deleted the 230518-zmq branch May 22, 2023 09:04
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request May 23, 2023
@fanquake
Merge bitcoin#27696: build: Do not define ENABLE_ZMQ when ZMQ is not …
b64b156 
…avail…
@luke-jr
Copy link
Member

luke-jr commented Jun 23, 2023

Huh? This looks wrong... #if does check the value.

@hebasto
Copy link
Member Author

hebasto commented Jun 23, 2023

Huh? This looks wrong... #if does check the value.

It does. But when the build system either defines VAR to 1 or leaves it undefined, the behavior of #if VAR and #ifdef VAR is the same, which is the case in this PR.

@bitcoin bitcoin locked and limited conversation to collaborators Jun 22, 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

+1 more reviewer

@jarolrod jarolrod jarolrod approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Build system

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@hebasto @DrahtBot @jarolrod @luke-jr @sedited @fanquake