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

pull hebasto wants to merge 1 commits into bitcoin:master from hebasto:230518-zmq changing 2 files +5 −8
  1. hebasto commented at 9:57 am on May 18, 2023: member

    A new behavior is consistent with the other optional dependencies.

    The source code contains #if ENABLE_ZMQ lines only:

    0$ git grep ENABLE_ZMQ -- src/*.cpp
    1src/init.cpp:#if ENABLE_ZMQ
    2src/init.cpp:#if ENABLE_ZMQ
    3src/init.cpp:#if ENABLE_ZMQ
    4src/init.cpp:#if ENABLE_ZMQ
    5src/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:

  2. build: Do not define `ENABLE_ZMQ` when ZMQ is not available
    A new behavior is consistent with the other optional dependencies.
    
    The source code contains `#if ENABLE_ZMQ` lines only.
    fa5831bd6f
  3. DrahtBot commented at 9:57 am on May 18, 2023: contributor

    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.

  4. DrahtBot added the label Build system on May 18, 2023
  5. fanquake requested review from TheCharlatan on May 19, 2023
  6. TheCharlatan approved
  7. TheCharlatan commented at 11:14 am on May 21, 2023: contributor

    ACK fa5831bd6f940c4afb43ff625ba4fa6c641e999a

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

  8. jarolrod commented at 5:15 am on May 22, 2023: member

    hashes:

     07091c64cada36ec2850f889978ae5fdc3cf4f28ec40bfb1fd16100c3f502fe6e  guix-build-fa5831bd6f94/output/aarch64-linux-gnu/SHA256SUMS.part
     1e3b87e22e4cbd7a50aac4d5c982c12dd5b3f224ff4f9543dd3c331d424899287  guix-build-fa5831bd6f94/output/aarch64-linux-gnu/bitcoin-fa5831bd6f94-aarch64-linux-gnu-debug.tar.gz
     296ffa1075a4b1d14c842bb8a5f5106cdb8f401eb173578c7376f6454b918e4eb  guix-build-fa5831bd6f94/output/aarch64-linux-gnu/bitcoin-fa5831bd6f94-aarch64-linux-gnu.tar.gz
     31bbe3a56784762b811eadce056849ca24502f34e3622c59dd7f73d84ecc475a6  guix-build-fa5831bd6f94/output/arm-linux-gnueabihf/SHA256SUMS.part
     4f8126f1090e0cd0da5edd492840f7661d9a47c4649024ffc4673d58ac4c19ea0  guix-build-fa5831bd6f94/output/arm-linux-gnueabihf/bitcoin-fa5831bd6f94-arm-linux-gnueabihf-debug.tar.gz
     55436c0c6e019ae61a5e92f41701e2dbd3b79a8be14edd0eaea48c5d09c348ec1  guix-build-fa5831bd6f94/output/arm-linux-gnueabihf/bitcoin-fa5831bd6f94-arm-linux-gnueabihf.tar.gz
     665e6552abd91b69a7b1aea0dc90150b44d9ccdb6ee0af97f057c601706372014  guix-build-fa5831bd6f94/output/arm64-apple-darwin/SHA256SUMS.part
     7054a90dcc0d0051522ffbcb90a2d7a82433d0d9eb41b2e483086342ca992447b  guix-build-fa5831bd6f94/output/arm64-apple-darwin/bitcoin-fa5831bd6f94-arm64-apple-darwin-unsigned.dmg
     83f1d8b4b1efd360ba426e7aa0bda41ccb73ad6bd14c4613faabb32ed008f6a66  guix-build-fa5831bd6f94/output/arm64-apple-darwin/bitcoin-fa5831bd6f94-arm64-apple-darwin-unsigned.tar.gz
     91ff15ea7ba7a5933549e0b0fa533c37fa808f4410acbdf1ceb07be16e0ae5272  guix-build-fa5831bd6f94/output/arm64-apple-darwin/bitcoin-fa5831bd6f94-arm64-apple-darwin.tar.gz
    109a156adb382142a6a0423cea432be7f0e15522b30b2e785edac185093dc93af8  guix-build-fa5831bd6f94/output/dist-archive/bitcoin-fa5831bd6f94.tar.gz
    117870e1918dbb94ed61a73ef8b448538a99fbbf71c30e9ee76942ae0b208c05c7  guix-build-fa5831bd6f94/output/powerpc64-linux-gnu/SHA256SUMS.part
    120b27d4e2004804d31fffea933c54f3c890eff8eced66cab537c7361cfc8f4030  guix-build-fa5831bd6f94/output/powerpc64-linux-gnu/bitcoin-fa5831bd6f94-powerpc64-linux-gnu-debug.tar.gz
    131c5ef4da76a5da7ccade4c268a2e3642e73dbf90c8335270c78c7784f05d4ed9  guix-build-fa5831bd6f94/output/powerpc64-linux-gnu/bitcoin-fa5831bd6f94-powerpc64-linux-gnu.tar.gz
    1410d1772badec14bb386e8a8f94cb52a11fbe7f8998a977e03a655f84f87c959d  guix-build-fa5831bd6f94/output/powerpc64le-linux-gnu/SHA256SUMS.part
    15dbad63b3761e3d44f8ca63df64ce2bcea18089fad0840132fc0380e7507ce320  guix-build-fa5831bd6f94/output/powerpc64le-linux-gnu/bitcoin-fa5831bd6f94-powerpc64le-linux-gnu-debug.tar.gz
    166174e1baa088194f380da89eebf86afc4430e7f8b7f3f86825bebc578823d8d9  guix-build-fa5831bd6f94/output/powerpc64le-linux-gnu/bitcoin-fa5831bd6f94-powerpc64le-linux-gnu.tar.gz
    17c88d14e96a960a990d660b539805797620e19f30c0b7cf43b9e0a89646bfe8c3  guix-build-fa5831bd6f94/output/riscv64-linux-gnu/SHA256SUMS.part
    181797d792e69a05fc8636d7ac34c618cf3f0881cfb388e48235ba6fdd097fc495  guix-build-fa5831bd6f94/output/riscv64-linux-gnu/bitcoin-fa5831bd6f94-riscv64-linux-gnu-debug.tar.gz
    19c8bd9cbd06ee6732e694d3151a901375983126be787128f91d33a1b354a2d760  guix-build-fa5831bd6f94/output/riscv64-linux-gnu/bitcoin-fa5831bd6f94-riscv64-linux-gnu.tar.gz
    2060ea9244ad189256f983d6fcef0f5236837db3aebccc03551e6c1c96cb7d4b4f  guix-build-fa5831bd6f94/output/x86_64-apple-darwin/SHA256SUMS.part
    211a5ecb7c2cd3d3df297bbf0ac2f3d31c8a175f23ec469b7c467cf2fdb910b2ca  guix-build-fa5831bd6f94/output/x86_64-apple-darwin/bitcoin-fa5831bd6f94-x86_64-apple-darwin-unsigned.dmg
    22dc5d68a127ab55238c0e7f50ddab91b805fbc860b56efcf02ec9c3bbb496e9e5  guix-build-fa5831bd6f94/output/x86_64-apple-darwin/bitcoin-fa5831bd6f94-x86_64-apple-darwin-unsigned.tar.gz
    23571de9aaa08229cd12b32eb7e1c40c9eb4b14558df32f8d7c5609cc42581faec  guix-build-fa5831bd6f94/output/x86_64-apple-darwin/bitcoin-fa5831bd6f94-x86_64-apple-darwin.tar.gz
    24f74c8f125a340978e90a7222453b8164936ee5ceef67f90a05d74eee4af78b10  guix-build-fa5831bd6f94/output/x86_64-linux-gnu/SHA256SUMS.part
    255754a6ea8bf74794806b1e2438971f090f0fafc10a10af16d3365a415bb82623  guix-build-fa5831bd6f94/output/x86_64-linux-gnu/bitcoin-fa5831bd6f94-x86_64-linux-gnu-debug.tar.gz
    26fcf96d48fc7badfa6e7237cd5e1baf8f904bdae3c5cef4515410beef197aa0a7  guix-build-fa5831bd6f94/output/x86_64-linux-gnu/bitcoin-fa5831bd6f94-x86_64-linux-gnu.tar.gz
    274f1117782b5926876e5557685c51df76795072c1558423ce914ef9d9ff18017e  guix-build-fa5831bd6f94/output/x86_64-w64-mingw32/SHA256SUMS.part
    28f1fa73d4b9e3d23ddfa1ef1589d1fff06125dfdbae3e8dc55bf07af0994a1909  guix-build-fa5831bd6f94/output/x86_64-w64-mingw32/bitcoin-fa5831bd6f94-win64-debug.zip
    29137a93d9c530de94bf9a888142ae3b2b3eed61c5208a97391cf252cb33acc9c1  guix-build-fa5831bd6f94/output/x86_64-w64-mingw32/bitcoin-fa5831bd6f94-win64-setup-unsigned.exe
    30a46fc4764953b5aa3556c026ca847c9307629d68fb4168f4aa0ea8799ef2297f  guix-build-fa5831bd6f94/output/x86_64-w64-mingw32/bitcoin-fa5831bd6f94-win64-unsigned.tar.gz
    3174ec6b8231ba49c2191d82514f063f4c71f2f3ed991ee80a7f0b15fa7e1d516e  guix-build-fa5831bd6f94/output/x86_64-w64-mingw32/bitcoin-fa5831bd6f94-win64.zip```
    
  9. jarolrod approved
  10. jarolrod commented at 5:15 am on May 22, 2023: member
    ACK fa5831bd6f940c4afb43ff625ba4fa6c641e999a
  11. fanquake merged this on May 22, 2023
  12. fanquake closed this on May 22, 2023

  13. hebasto deleted the branch on May 22, 2023
  14. sidhujag referenced this in commit b64b156bcc on May 23, 2023
  15. luke-jr commented at 6:57 pm on June 23, 2023: member
    Huh? This looks wrong… #if does check the value.
  16. hebasto commented at 7:16 pm on June 23, 2023: member

    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.

  17. bitcoin locked this on Jun 22, 2024

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-07-03 10:13 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me