build: Fix macOS Apple M1 build with miniupnpc and libnatpmp. Again :) #24958

pull hebasto wants to merge 3 commits into bitcoin:master from hebasto:220424-flags changing 1 files +36 −30
  1. hebasto commented at 1:44 pm on April 24, 2022: member

    Apparently, bitcoin/bitcoin#24391 broke the ability of the configure script to pick up Homebrew’s miniupnpc and libnatpmp packages on macOS Apple M1.

    This PR fixes it.

  2. hebasto added the label macOS on Apr 24, 2022
  3. hebasto added the label Build system on Apr 24, 2022
  4. build, refactor: Fix indentation bbbcb96638
  5. build: Fix `AC_CHECK_HEADERS` and `AC_CHECK_LIB` for `miniupnpc` package 65cddf604c
  6. build: Fix `AC_CHECK_HEADERS` and `AC_CHECK_LIB` for `libnatpmp` package 165903406e
  7. hebasto force-pushed on Apr 24, 2022
  8. DrahtBot commented at 1:02 am on April 25, 2022: member

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

    Conflicts

    Reviewers, this pull request conflicts with the following ones:

    • #24671 (build: remove unneeded configure $*val setting by fanquake)
    • #22644 (Deprecate UPnP support, require 2.1 or later 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.

  9. promag commented at 8:32 pm on April 25, 2022: member

    Tested ACK 165903406ecac363fc5101c2aa142aff75f76e8f

    On b1c5991eebb916755be188f355ad36fe01a3f529

    0./autogen.sh && ./configure
    1
    2  with upnp       = no
    3  with natpmp     = no
    

    On 165903406ecac363fc5101c2aa142aff75f76e8f

    0./autogen.sh && ./configure
    1
    2  with upnp       = yes
    3  with natpmp     = yes
    
  10. laanwj commented at 12:20 pm on April 27, 2022: member
    Changes look sane to me, cannot test.
  11. jarolrod commented at 9:19 pm on April 27, 2022: member

    tACK 165903406ecac363fc5101c2aa142aff75f76e8f

    This fixes the issue for me. Code changes look good to me.

    master

    0  with upnp       = no
    1  with natpmp     = no
    

    pr

    0  with upnp       = yes
    1  with natpmp     = yes
    
  12. laanwj merged this on Apr 28, 2022
  13. laanwj closed this on Apr 28, 2022

  14. hebasto deleted the branch on Apr 28, 2022
  15. sidhujag referenced this in commit 7c532b2829 on Apr 29, 2022
  16. DrahtBot locked this on Apr 28, 2023

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-11-21 09:12 UTC

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