Skip to content
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.

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

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

Merged
merged 3 commits into from Apr 28, 2022

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Apr 24, 2022

Apparently, #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.

@DrahtBot
Copy link
Contributor

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.

Copy link
Member

@promag promag left a comment

Choose a reason for hiding this comment

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

Tested ACK 1659034

On b1c5991

./autogen.sh && ./configure

  with upnp       = no
  with natpmp     = no

On 1659034

./autogen.sh && ./configure

  with upnp       = yes
  with natpmp     = yes

@laanwj
Copy link
Member

laanwj commented Apr 27, 2022

Changes look sane to me, cannot test.

Copy link
Member

@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.

tACK 1659034

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 laanwj merged commit 8730bd3 into bitcoin:master Apr 28, 2022
@hebasto hebasto deleted the 220424-flags branch April 28, 2022 18:47
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Apr 29, 2022
…nd libnatpmp. Again :)

1659034 build: Fix `AC_CHECK_HEADERS` and `AC_CHECK_LIB` for `libnatpmp` package (Hennadii Stepanov)
65cddf6 build: Fix `AC_CHECK_HEADERS` and `AC_CHECK_LIB` for `miniupnpc` package (Hennadii Stepanov)
bbbcb96 build, refactor: Fix indentation (Hennadii Stepanov)

Pull request description:

  Apparently, bitcoin#24391 broke the [ability](bitcoin#22397) of the `configure` script to pick up Homebrew's `miniupnpc` and `libnatpmp` packages on macOS Apple M1.

  This PR fixes it.

ACKs for top commit:
  promag:
    Tested ACK 1659034
  jarolrod:
    tACK 1659034

Tree-SHA512: 93988f59f425890d60582b93d4ac5b2ad03011a5c6dbb44678a3ca591da7518c1c741bc1045b2c763bbe887947f32293b38d55fd7a96f09d2092ad34baa1db21
@bitcoin bitcoin locked and limited conversation to collaborators Apr 28, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants