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

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.
hebasto added the label macOS on Apr 24, 2022
hebasto added the label Build system on Apr 24, 2022
build, refactor: Fix indentation bbbcb96638
build: Fix `AC_CHECK_HEADERS` and `AC_CHECK_LIB` for `miniupnpc` package 65cddf604c
build: Fix `AC_CHECK_HEADERS` and `AC_CHECK_LIB` for `libnatpmp` package 165903406e
hebasto force-pushed on Apr 24, 2022
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.
promag commented at 8:32 PM on April 25, 2022: member
Tested ACK 165903406ecac363fc5101c2aa142aff75f76e8f

On b1c5991eebb916755be188f355ad36fe01a3f529
```
./autogen.sh && ./configure

  with upnp       = no
  with natpmp     = no
```
On 165903406ecac363fc5101c2aa142aff75f76e8f
```
./autogen.sh && ./configure

  with upnp       = yes
  with natpmp     = yes
```
laanwj commented at 12:20 PM on April 27, 2022: member

Changes look sane to me, cannot test.
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
```
  with upnp       = no
  with natpmp     = no
```
pr
```
  with upnp       = yes
  with natpmp     = yes
```
laanwj merged this on Apr 28, 2022
laanwj closed this on Apr 28, 2022
hebasto deleted the branch on Apr 28, 2022
sidhujag referenced this in commit 7c532b2829 on Apr 29, 2022
DrahtBot locked this on Apr 28, 2023

Contributors

Labels

Linked (view graph)

#22397 build: Fix macOS Apple Silicon build with miniupnpc and libnatpmp

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

Conflicts