depends: set two CMake options globally #29706

pull fanquake wants to merge 2 commits into bitcoin:master from fanquake:cmake_pic_libdir changing 4 files +9 −13
  1. fanquake commented at 5:11 pm on March 22, 2024: member
    Set CMAKE_INSTALL_LIBDIR=lib/ and CMAKE_POSITION_INDEPENDENT_CODE=ON globally in depends, rather than per-package. CMAKE_INSTALL_LIBDIR=lib/ is needed to override the annoying GNUInstallDirs lib vs lib64 behaviour, and we always want PIC code. The PIC commit is the counterpart to the same Autotools change in #29488. I’m PRing these commits as I have a CMake branch building on top, and want to avoid adding the same workarounds to every package we are going to touch, but these can go in separately as the build should be tested for existing packages (i.e multiprocess).
  2. DrahtBot commented at 5:11 pm on March 22, 2024: contributor

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

    Code Coverage

    For detailed information about the code coverage, see the test coverage report.

    Reviews

    See the guideline for information on the review process.

    Type Reviewers
    ACK hebasto, theuni

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

    Conflicts

    Reviewers, this pull request conflicts with the following ones:

    • #29488 (depends: always configure with --with-pic by fanquake)

    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.

  3. DrahtBot added the label Build system on Mar 22, 2024
  4. fanquake removed the label Build system on Mar 22, 2024
  5. fanquake added the label DrahtBot Guix build requested on Mar 22, 2024
  6. DrahtBot commented at 5:12 am on March 23, 2024: contributor

    Guix builds (on x86_64)

    File commit a175efe768892f6e983a7c814a201c506c4d1ce5(master) commit 51d64a236dd734d07d3a5b6e00071e5766823930(master and this pull)
    SHA256SUMS.part 0996247d41516b95... 791e240e9ccf79fd...
    *-aarch64-linux-gnu-debug.tar.gz 1b5256bbde946777... e80ef3722aa07c24...
    *-aarch64-linux-gnu.tar.gz c3d4228d9df7dcce... e9fbdec80651befd...
    *-arm-linux-gnueabihf-debug.tar.gz baef69e3646ee2ee... 1d5175b9e575a2dc...
    *-arm-linux-gnueabihf.tar.gz 11456fab13280a24... dd5f57121cff9674...
    *-arm64-apple-darwin-unsigned.tar.gz dedc95a90a651d3f... b9b160db055ec786...
    *-arm64-apple-darwin-unsigned.zip 24eb2709bc481dde... d41f63f10f84accc...
    *-arm64-apple-darwin.tar.gz e3bd33a3f0fbff1b... 6ba04e0652dc44ac...
    *-powerpc64-linux-gnu-debug.tar.gz 95878617d4ebe517... 01c71692e460e9a3...
    *-powerpc64-linux-gnu.tar.gz e97b0caf1b832f66... ee61b370a1efa325...
    *-riscv64-linux-gnu-debug.tar.gz 2227d1962716593c... 711aa560c551401f...
    *-riscv64-linux-gnu.tar.gz d3c8d1c448da5c61... 82541d04d618fecd...
    *-x86_64-apple-darwin-unsigned.tar.gz a837864f005835b6... 20d88127acb6c564...
    *-x86_64-apple-darwin-unsigned.zip 0d3b1807d0455c20... 7b1abfd95a785c35...
    *-x86_64-apple-darwin.tar.gz 4ead718460dcd892... cfedab9b6e423002...
    *-x86_64-linux-gnu-debug.tar.gz 930a682aea5918d7... feb2b5ae677b97d1...
    *-x86_64-linux-gnu.tar.gz 5bc91d4c25aeeff9... d46492de3bbfb0e1...
    *.tar.gz b1d70f2f5533b638... e157621879e4c37f...
    guix_build.log 859e12c3d2dcbc18... ab5e6788171ddf6d...
    guix_build.log.diff f4b298f76d849b91...
  7. DrahtBot removed the label DrahtBot Guix build requested on Mar 23, 2024
  8. DrahtBot added the label Build system on Mar 23, 2024
  9. hebasto approved
  10. hebasto commented at 12:13 pm on March 24, 2024: member
    ACK 6166bf45ca57a3506c91660f0fe613e2ad6bdcbc, I have reviewed the code and it looks OK.
  11. depends: always set CMAKE_INSTALL_LIBDIR=lib/
    Rather than setting this per package, set it globally, as this is always
    what we want. Without doing this, later commit will have to add the same
    doc + change to more packages.
    d04623678c
  12. depends: always set CMAKE_POSITION_INDEPENDENT_CODE=ON
    Rather than potentially having to set this per-package, set it globally,
    as this should always be what we want. Without doing this, changes in
    later commits will have to add this per-package.
    
    Similar to https://github.com/bitcoin/bitcoin/pull/29488, which is the
    Autotools equivalent.
    76045bb9d6
  13. fanquake force-pushed on Mar 25, 2024
  14. fanquake commented at 10:52 am on March 25, 2024: member
    Rebased for #29488 and addressed the comment from that PR.
  15. hebasto approved
  16. hebasto commented at 10:54 am on March 25, 2024: member
    re-ACK 76045bb9d6808931cd0f2933203b5b611e032ec8.
  17. fanquake commented at 12:19 pm on March 25, 2024: member

    Guix Build (aarch64):

     00b95e2e1393950de30c9c3d94e0408825fb38e3baa08390f524e6d863dc76ee1  guix-build-76045bb9d680/output/aarch64-linux-gnu/SHA256SUMS.part
     17d3769bca1ef1c08575d572c10e58467da77d8e88743182269a275eba401eedd  guix-build-76045bb9d680/output/aarch64-linux-gnu/bitcoin-76045bb9d680-aarch64-linux-gnu-debug.tar.gz
     23cc9d1b4bee351f02f86c58ca9f692a31e1ac71146ac48265cec7da095029ee7  guix-build-76045bb9d680/output/aarch64-linux-gnu/bitcoin-76045bb9d680-aarch64-linux-gnu.tar.gz
     319ef707cfe4deb58698746ade6bbe5f45b190e3e9fcb4d8c8620c01cb0fe06fe  guix-build-76045bb9d680/output/arm-linux-gnueabihf/SHA256SUMS.part
     44b55fe175ed65047b876380654421e4cec1ea390f42651cda949ffc4e43fbae1  guix-build-76045bb9d680/output/arm-linux-gnueabihf/bitcoin-76045bb9d680-arm-linux-gnueabihf-debug.tar.gz
     51091ba17b80f748e5d0d3817ef4b3032dead635952aff34f58f71820639dee5f  guix-build-76045bb9d680/output/arm-linux-gnueabihf/bitcoin-76045bb9d680-arm-linux-gnueabihf.tar.gz
     62e2c2633ae3f0b3accf04bd80f0c989bf0fc5c4c7fadace1a344b1595211f210  guix-build-76045bb9d680/output/arm64-apple-darwin/SHA256SUMS.part
     7df8edf0f441385d4f81fc76b859a8123f234175102b47472ee07a2b96660284c  guix-build-76045bb9d680/output/arm64-apple-darwin/bitcoin-76045bb9d680-arm64-apple-darwin-unsigned.tar.gz
     85db038889701aacd1eb75e484d33a744181a83cd69b045dd1f12e14b197ea4b9  guix-build-76045bb9d680/output/arm64-apple-darwin/bitcoin-76045bb9d680-arm64-apple-darwin-unsigned.zip
     90f22de3d630e3af60e1bdc515b1a9e78cf76cfd7930c36b84a6b07033cb18ae8  guix-build-76045bb9d680/output/arm64-apple-darwin/bitcoin-76045bb9d680-arm64-apple-darwin.tar.gz
    101f7636a2f0bfa751f31002ea7ccd510c86bd7cfbe194d94a53e3ba4a8adb07fd  guix-build-76045bb9d680/output/dist-archive/bitcoin-76045bb9d680.tar.gz
    11a461c18dcee5cc34e266466c5e96a89705ed25d36673b2450724f45c68d56b2a  guix-build-76045bb9d680/output/powerpc64-linux-gnu/SHA256SUMS.part
    1209e18e5e91aed2bac05909f75489e4fe0b8eb74a7247749b113687d74eff769a  guix-build-76045bb9d680/output/powerpc64-linux-gnu/bitcoin-76045bb9d680-powerpc64-linux-gnu-debug.tar.gz
    1342af567c2b8fcfae09409e2b5973ac12a10c9ca7a2a0a872e8a619e3fd37550e  guix-build-76045bb9d680/output/powerpc64-linux-gnu/bitcoin-76045bb9d680-powerpc64-linux-gnu.tar.gz
    1476c4605b41d0ebef80aa9c4f65dca6068902ee2c10069d85adc7f1df09e66e7a  guix-build-76045bb9d680/output/riscv64-linux-gnu/SHA256SUMS.part
    15017b0851ed279b5186c87715e5826e9cc31739d0cc1a83a3b33501fde05fa41b  guix-build-76045bb9d680/output/riscv64-linux-gnu/bitcoin-76045bb9d680-riscv64-linux-gnu-debug.tar.gz
    16bfcd63aabf57b2bb80c62ab49584b99cb45e0992ed2efb4d24a9e347f8f81ad7  guix-build-76045bb9d680/output/riscv64-linux-gnu/bitcoin-76045bb9d680-riscv64-linux-gnu.tar.gz
    178c16bb230b482d502533f7deaf1f175bee83a6dc705100e88b11417bd4c701ef  guix-build-76045bb9d680/output/x86_64-apple-darwin/SHA256SUMS.part
    1847db4862b3c0fc9bfdb1a298a73be0cc7fc1152396dedddf2e199029bd257f89  guix-build-76045bb9d680/output/x86_64-apple-darwin/bitcoin-76045bb9d680-x86_64-apple-darwin-unsigned.tar.gz
    194b45b44110c4ad65670c02caf3662dc99800d72189626dcdb2e3a45e7105dd64  guix-build-76045bb9d680/output/x86_64-apple-darwin/bitcoin-76045bb9d680-x86_64-apple-darwin-unsigned.zip
    203df17878029b793e722861a3fc670e6c087347f91889b32e3ab3d53b389b2903  guix-build-76045bb9d680/output/x86_64-apple-darwin/bitcoin-76045bb9d680-x86_64-apple-darwin.tar.gz
    219b2592d48bd53f41d83fa2d3e61d34057bd8c30678187d0436c210d0c7cf385b  guix-build-76045bb9d680/output/x86_64-linux-gnu/SHA256SUMS.part
    22c96b1c4eade5e5309a0f77d60f0bcd2139ede8faa1ed5ea20cc97394700153f7  guix-build-76045bb9d680/output/x86_64-linux-gnu/bitcoin-76045bb9d680-x86_64-linux-gnu-debug.tar.gz
    23282fa857f67d1c76778210b50dfc38eac572339d3654fc7a47efc04d224d5238  guix-build-76045bb9d680/output/x86_64-linux-gnu/bitcoin-76045bb9d680-x86_64-linux-gnu.tar.gz
    2461694126644cf2ffe7ec7dbad1111b3e8ba2c1236142f3ea1db84bafb4ffec41  guix-build-76045bb9d680/output/x86_64-w64-mingw32/SHA256SUMS.part
    258328c1e8832dfb86151d7b6612dd98aaa3708df035d0d50815533b2a6659653e  guix-build-76045bb9d680/output/x86_64-w64-mingw32/bitcoin-76045bb9d680-win64-debug.zip
    26dccc134738cf7215c74c3b0500e2928444184110e6d3705b630ed160b954fd77  guix-build-76045bb9d680/output/x86_64-w64-mingw32/bitcoin-76045bb9d680-win64-setup-unsigned.exe
    279c8a5a3d994bee9ad9f4a0c3e24dcfc40ff2b57cc32640c09ef932c21ae0f597  guix-build-76045bb9d680/output/x86_64-w64-mingw32/bitcoin-76045bb9d680-win64-unsigned.tar.gz
    28b6bf76e10a0e1808693969a55c6e3732f3a0b3b6f7e4c76267f66d9d079bf30c  guix-build-76045bb9d680/output/x86_64-w64-mingw32/bitcoin-76045bb9d680-win64.zip
    
  18. hebasto commented at 2:13 pm on March 25, 2024: member

    My Guix build:

     0x86_64
     10b95e2e1393950de30c9c3d94e0408825fb38e3baa08390f524e6d863dc76ee1  guix-build-76045bb9d680/output/aarch64-linux-gnu/SHA256SUMS.part
     27d3769bca1ef1c08575d572c10e58467da77d8e88743182269a275eba401eedd  guix-build-76045bb9d680/output/aarch64-linux-gnu/bitcoin-76045bb9d680-aarch64-linux-gnu-debug.tar.gz
     33cc9d1b4bee351f02f86c58ca9f692a31e1ac71146ac48265cec7da095029ee7  guix-build-76045bb9d680/output/aarch64-linux-gnu/bitcoin-76045bb9d680-aarch64-linux-gnu.tar.gz
     419ef707cfe4deb58698746ade6bbe5f45b190e3e9fcb4d8c8620c01cb0fe06fe  guix-build-76045bb9d680/output/arm-linux-gnueabihf/SHA256SUMS.part
     54b55fe175ed65047b876380654421e4cec1ea390f42651cda949ffc4e43fbae1  guix-build-76045bb9d680/output/arm-linux-gnueabihf/bitcoin-76045bb9d680-arm-linux-gnueabihf-debug.tar.gz
     61091ba17b80f748e5d0d3817ef4b3032dead635952aff34f58f71820639dee5f  guix-build-76045bb9d680/output/arm-linux-gnueabihf/bitcoin-76045bb9d680-arm-linux-gnueabihf.tar.gz
     72e2c2633ae3f0b3accf04bd80f0c989bf0fc5c4c7fadace1a344b1595211f210  guix-build-76045bb9d680/output/arm64-apple-darwin/SHA256SUMS.part
     8df8edf0f441385d4f81fc76b859a8123f234175102b47472ee07a2b96660284c  guix-build-76045bb9d680/output/arm64-apple-darwin/bitcoin-76045bb9d680-arm64-apple-darwin-unsigned.tar.gz
     95db038889701aacd1eb75e484d33a744181a83cd69b045dd1f12e14b197ea4b9  guix-build-76045bb9d680/output/arm64-apple-darwin/bitcoin-76045bb9d680-arm64-apple-darwin-unsigned.zip
    100f22de3d630e3af60e1bdc515b1a9e78cf76cfd7930c36b84a6b07033cb18ae8  guix-build-76045bb9d680/output/arm64-apple-darwin/bitcoin-76045bb9d680-arm64-apple-darwin.tar.gz
    111f7636a2f0bfa751f31002ea7ccd510c86bd7cfbe194d94a53e3ba4a8adb07fd  guix-build-76045bb9d680/output/dist-archive/bitcoin-76045bb9d680.tar.gz
    12a461c18dcee5cc34e266466c5e96a89705ed25d36673b2450724f45c68d56b2a  guix-build-76045bb9d680/output/powerpc64-linux-gnu/SHA256SUMS.part
    1309e18e5e91aed2bac05909f75489e4fe0b8eb74a7247749b113687d74eff769a  guix-build-76045bb9d680/output/powerpc64-linux-gnu/bitcoin-76045bb9d680-powerpc64-linux-gnu-debug.tar.gz
    1442af567c2b8fcfae09409e2b5973ac12a10c9ca7a2a0a872e8a619e3fd37550e  guix-build-76045bb9d680/output/powerpc64-linux-gnu/bitcoin-76045bb9d680-powerpc64-linux-gnu.tar.gz
    1576c4605b41d0ebef80aa9c4f65dca6068902ee2c10069d85adc7f1df09e66e7a  guix-build-76045bb9d680/output/riscv64-linux-gnu/SHA256SUMS.part
    16017b0851ed279b5186c87715e5826e9cc31739d0cc1a83a3b33501fde05fa41b  guix-build-76045bb9d680/output/riscv64-linux-gnu/bitcoin-76045bb9d680-riscv64-linux-gnu-debug.tar.gz
    17bfcd63aabf57b2bb80c62ab49584b99cb45e0992ed2efb4d24a9e347f8f81ad7  guix-build-76045bb9d680/output/riscv64-linux-gnu/bitcoin-76045bb9d680-riscv64-linux-gnu.tar.gz
    188c16bb230b482d502533f7deaf1f175bee83a6dc705100e88b11417bd4c701ef  guix-build-76045bb9d680/output/x86_64-apple-darwin/SHA256SUMS.part
    1947db4862b3c0fc9bfdb1a298a73be0cc7fc1152396dedddf2e199029bd257f89  guix-build-76045bb9d680/output/x86_64-apple-darwin/bitcoin-76045bb9d680-x86_64-apple-darwin-unsigned.tar.gz
    204b45b44110c4ad65670c02caf3662dc99800d72189626dcdb2e3a45e7105dd64  guix-build-76045bb9d680/output/x86_64-apple-darwin/bitcoin-76045bb9d680-x86_64-apple-darwin-unsigned.zip
    213df17878029b793e722861a3fc670e6c087347f91889b32e3ab3d53b389b2903  guix-build-76045bb9d680/output/x86_64-apple-darwin/bitcoin-76045bb9d680-x86_64-apple-darwin.tar.gz
    229b2592d48bd53f41d83fa2d3e61d34057bd8c30678187d0436c210d0c7cf385b  guix-build-76045bb9d680/output/x86_64-linux-gnu/SHA256SUMS.part
    23c96b1c4eade5e5309a0f77d60f0bcd2139ede8faa1ed5ea20cc97394700153f7  guix-build-76045bb9d680/output/x86_64-linux-gnu/bitcoin-76045bb9d680-x86_64-linux-gnu-debug.tar.gz
    24282fa857f67d1c76778210b50dfc38eac572339d3654fc7a47efc04d224d5238  guix-build-76045bb9d680/output/x86_64-linux-gnu/bitcoin-76045bb9d680-x86_64-linux-gnu.tar.gz
    2561694126644cf2ffe7ec7dbad1111b3e8ba2c1236142f3ea1db84bafb4ffec41  guix-build-76045bb9d680/output/x86_64-w64-mingw32/SHA256SUMS.part
    268328c1e8832dfb86151d7b6612dd98aaa3708df035d0d50815533b2a6659653e  guix-build-76045bb9d680/output/x86_64-w64-mingw32/bitcoin-76045bb9d680-win64-debug.zip
    27dccc134738cf7215c74c3b0500e2928444184110e6d3705b630ed160b954fd77  guix-build-76045bb9d680/output/x86_64-w64-mingw32/bitcoin-76045bb9d680-win64-setup-unsigned.exe
    289c8a5a3d994bee9ad9f4a0c3e24dcfc40ff2b57cc32640c09ef932c21ae0f597  guix-build-76045bb9d680/output/x86_64-w64-mingw32/bitcoin-76045bb9d680-win64-unsigned.tar.gz
    29b6bf76e10a0e1808693969a55c6e3732f3a0b3b6f7e4c76267f66d9d079bf30c  guix-build-76045bb9d680/output/x86_64-w64-mingw32/bitcoin-76045bb9d680-win64.zip
    
  19. theuni approved
  20. theuni commented at 3:22 pm on March 25, 2024: member
    utACK 76045bb9d6808931cd0f2933203b5b611e032ec8. Both changes make sense to me, and both can be overridden if needed, though I can’t imagine we’d need to.
  21. fanquake merged this on Mar 25, 2024
  22. fanquake closed this on Mar 25, 2024

  23. fanquake deleted the branch on Mar 25, 2024
  24. TheCharlatan commented at 6:37 pm on March 25, 2024: contributor

    Post merge ACK 76045bb9d6808931cd0f2933203b5b611e032ec8

    Also get a matching build.


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-09-28 22:12 UTC

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