Skip to content

depends: Fix qt.mk for mac arm64 #22123

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.

Sign up for GitHub

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

Jump to bottom
Merged
fanquake merged 1 commit into from
Jun 3, 2021
Merged

depends: Fix qt.mk for mac arm64 #22123

fanquake merged 1 commit into from
Jun 3, 2021

Conversation

@promag
Copy link
Contributor

@promag promag commented Jun 2, 2021 •
edited
Loading

With f16d4cd depends/config.guess gives aarch64-apple-darwin20.3.0 where before would give arm-apple-darwin20.3.0. Fix qt.mk accordingly.

@fanquake
Copy link
Member

fanquake commented Jun 2, 2021

What is the current problem?
Is this fixing a native M1 depends build, or a cross-compile?
Why is this a "better" fix than what was added in #20482?

@promag
Copy link
Contributor Author

promag commented Jun 2, 2021 •
edited
Loading

Is this fixing a native M1 depends build, or a cross-compile?

native

What is the current problem?

Before this PR, after building depends the configure gives errors like:

ld: warning: ignoring file /Users/joao/Projects/bitcoin-core/22054/depends/aarch64-apple-darwin20.3.0/lib/libQt5Widgets.a, building for macOS-arm64 but attempting to link with file built for macOS-x86_64
Undefined symbols for architecture arm64:
  "qt_static_plugin_QCocoaIntegrationPlugin()", referenced from:
      __GLOBAL__sub_I_conftest.cpp in conftest-7867ef.o
  "qRegisterStaticPluginFunction(QStaticPlugin)", referenced from:
      __GLOBAL__sub_I_conftest.cpp in conftest-7867ef.o
ld: symbol(s) not found for architecture arm64
clang: error: linker command failed with exit code 1 (use -v to see invocation)

Before it was depends/arm-apple-darwin20.3.0.

hebasto
hebasto approved these changes Jun 2, 2021
View reviewed changes
Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

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

ACK 3b36395, I have reviewed the code and it looks OK, I agree it can be merged.

Did not test it on Apple M1.

fanquake
fanquake approved these changes Jun 3, 2021
View reviewed changes
Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

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

ACK 3b36395

@fanquake fanquake merged commit fcfd37f into bitcoin:master Jun 3, 2021
@promag promag deleted the 2021-06-fix-aarch64_darwin branch June 3, 2021 13:09
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jun 3, 2021
@fanquake
Merge bitcoin#22123: depends: Fix qt.mk for mac arm64
37833ab 
3b36395 depends: Fix qt.mk for mac arm64 (João Barbosa)

Pull request description:

  With f16d4cd `depends/config.guess` gives `aarch64-apple-darwin20.3.0` where before would give `arm-apple-darwin20.3.0`. Fix `qt.mk` accordingly.

ACKs for top commit:
  hebasto:
    ACK 3b36395, I have reviewed the code and it looks OK, I agree it can be merged.
  fanquake:
    ACK 3b36395

Tree-SHA512: bd20402d0a6e9a5bb652198de189cf2b4f3f76fd03d0cba8c4d657c60b8a088cf3532efe6c1efbbedd94c00a155e6d180b77f1cd8bc24e0e35764839e8b77e30
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jul 1, 2021
@fanquake @PastaPastaPasta
Merge bitcoin#22123: depends: Fix qt.mk for mac arm64
63428b0 
3b36395 depends: Fix qt.mk for mac arm64 (João Barbosa)

Pull request description:

  With f16d4cd `depends/config.guess` gives `aarch64-apple-darwin20.3.0` where before would give `arm-apple-darwin20.3.0`. Fix `qt.mk` accordingly.

ACKs for top commit:
  hebasto:
    ACK 3b36395, I have reviewed the code and it looks OK, I agree it can be merged.
  fanquake:
    ACK 3b36395

Tree-SHA512: bd20402d0a6e9a5bb652198de189cf2b4f3f76fd03d0cba8c4d657c60b8a088cf3532efe6c1efbbedd94c00a155e6d180b77f1cd8bc24e0e35764839e8b77e30
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Sep 24, 2021
@fanquake @PastaPastaPasta
Merge bitcoin#22123: depends: Fix qt.mk for mac arm64
70c2997 
3b36395 depends: Fix qt.mk for mac arm64 (João Barbosa)

Pull request description:

  With f16d4cd `depends/config.guess` gives `aarch64-apple-darwin20.3.0` where before would give `arm-apple-darwin20.3.0`. Fix `qt.mk` accordingly.

ACKs for top commit:
  hebasto:
    ACK 3b36395, I have reviewed the code and it looks OK, I agree it can be merged.
  fanquake:
    ACK 3b36395

Tree-SHA512: bd20402d0a6e9a5bb652198de189cf2b4f3f76fd03d0cba8c4d657c60b8a088cf3532efe6c1efbbedd94c00a155e6d180b77f1cd8bc24e0e35764839e8b77e30
gades pushed a commit to cosanta/cosanta-core that referenced this pull request Apr 20, 2022
@fanquake @gades
Merge bitcoin#22123: depends: Fix qt.mk for mac arm64
23b5ebd 
3b36395 depends: Fix qt.mk for mac arm64 (João Barbosa)

Pull request description:

  With f16d4cd `depends/config.guess` gives `aarch64-apple-darwin20.3.0` where before would give `arm-apple-darwin20.3.0`. Fix `qt.mk` accordingly.

ACKs for top commit:
  hebasto:
    ACK 3b36395, I have reviewed the code and it looks OK, I agree it can be merged.
  fanquake:
    ACK 3b36395

Tree-SHA512: bd20402d0a6e9a5bb652198de189cf2b4f3f76fd03d0cba8c4d657c60b8a088cf3532efe6c1efbbedd94c00a155e6d180b77f1cd8bc24e0e35764839e8b77e30
gwillen pushed a commit to ElementsProject/elements that referenced this pull request Jun 1, 2022
@apoelstra
Merge fcfd37f into merged_master (Bitcoin PR bitcoin/bitcoin#22123)
f26f9a1 
Added a limit to the tx_pool and tx_pool_standard fuzztest loops,
not because it had anything to do with this PR, but because it was
causing long fuzztests runs and I happened to stop the merge script
here.
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@fanquake fanquake fanquake approved these changes

@hebasto hebasto hebasto approved these changes

@jonasschnelli jonasschnelli Awaiting requested review from jonasschnelli

@JeremyRubin JeremyRubin Awaiting requested review from JeremyRubin

Assignees

No one assigned

Labels

Build system

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@promag @fanquake @hebasto