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 Qt processing of configure script for depends with DEBUG=1 #18298

Merged
merged 1 commit into from Mar 3, 2021

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Mar 9, 2020

This PR:

@DrahtBot
Copy link
Contributor

DrahtBot commented Mar 9, 2020

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

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.

@hebasto
Copy link
Member Author

hebasto commented Mar 16, 2020

fanquake added a commit that referenced this pull request Jun 13, 2020
…osts including Windows

8a26848 build: Fix m4 escaping (Hennadii Stepanov)
9123ec1 build: Remove extra tokens warning (Hennadii Stepanov)
fded4f4 build: Remove duplicated QT_STATICPLUGIN define (Hennadii Stepanov)
05a93d5 build: Fix indentation in bitcoin_qt.m4 (Hennadii Stepanov)
ddbb419 build: Use pkg-config in BITCOIN_QT_CONFIGURE for all hosts (Hennadii Stepanov)
492971d build: Fix mingw pkgconfig file and dependency naming (Hennadii Stepanov)

Pull request description:

  This PR makes `bitcoin_qt.m4` to use `pkg-config` for all hosts and removes non-pkg-config paths from it. This is a step towards the idea which was clear [stated](#8314 (comment)) by Cory Fields:
  > I believe the consensus is to treat Windows like the others and require pkg-config across the board. We can drop all of the non-pkg-config paths, and simply AC_REQUIRE(PKG_PROG_PKG_CONFIG)

  There are two unsolved problems with this PR. If depends is built with `DEBUG=1` the `configure` script fails to pickup Qt:
  - for macOS host (similar to, but not the same as #16391)
  - for Windows host (regression)

  The fix is ~on its way~ submitted in #18298 (as a followup).

  Also this PR picks some small improvements from #17820.

ACKs for top commit:
  theuni:
    Code review ACK 8a26848
  dongcarl:
    Code Review ACK 8a26848
  laanwj:
    Code review ACK 8a26848

Tree-SHA512: 3b25990934b939121983df7707997b31d61063b1207d909f539d69494c7cb85212f353092956d09ecffebb9fef28b869914dd1216a596d102fcb9744bb5487f7
@hebasto
Copy link
Member Author

hebasto commented Jun 13, 2020

Rebased 597445c -> 49ab294 (pr18298.02 -> pr18298.03) due to the conflict with #18297.

sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jun 13, 2020
…r all hosts including Windows

8a26848 build: Fix m4 escaping (Hennadii Stepanov)
9123ec1 build: Remove extra tokens warning (Hennadii Stepanov)
fded4f4 build: Remove duplicated QT_STATICPLUGIN define (Hennadii Stepanov)
05a93d5 build: Fix indentation in bitcoin_qt.m4 (Hennadii Stepanov)
ddbb419 build: Use pkg-config in BITCOIN_QT_CONFIGURE for all hosts (Hennadii Stepanov)
492971d build: Fix mingw pkgconfig file and dependency naming (Hennadii Stepanov)

Pull request description:

  This PR makes `bitcoin_qt.m4` to use `pkg-config` for all hosts and removes non-pkg-config paths from it. This is a step towards the idea which was clear [stated](bitcoin#8314 (comment)) by Cory Fields:
  > I believe the consensus is to treat Windows like the others and require pkg-config across the board. We can drop all of the non-pkg-config paths, and simply AC_REQUIRE(PKG_PROG_PKG_CONFIG)

  There are two unsolved problems with this PR. If depends is built with `DEBUG=1` the `configure` script fails to pickup Qt:
  - for macOS host (similar to, but not the same as bitcoin#16391)
  - for Windows host (regression)

  The fix is ~on its way~ submitted in bitcoin#18298 (as a followup).

  Also this PR picks some small improvements from bitcoin#17820.

ACKs for top commit:
  theuni:
    Code review ACK 8a26848
  dongcarl:
    Code Review ACK 8a26848
  laanwj:
    Code review ACK 8a26848

Tree-SHA512: 3b25990934b939121983df7707997b31d61063b1207d909f539d69494c7cb85212f353092956d09ecffebb9fef28b869914dd1216a596d102fcb9744bb5487f7
@hebasto hebasto closed this Jun 13, 2020
@hebasto hebasto reopened this Jun 13, 2020
@Sjors
Copy link
Member

Sjors commented Jun 16, 2020

Tested 49ab294 on macOS 10.15.5; works like a charm.

@hebasto hebasto closed this Jun 16, 2020
@hebasto hebasto reopened this Jun 16, 2020
@Sjors
Copy link
Member

Sjors commented Jun 29, 2020

It also works on macOS Big Sur 11.0 beta (after rebase).

cc @fanquake @theuni

@hebasto
Copy link
Member Author

hebasto commented Aug 6, 2020

@fanquake Mind reviewing this PR insofar as it fixes #16391 submitted by you :)

@hebasto
Copy link
Member Author

hebasto commented Aug 20, 2020

Rebased 49ab294 -> e25cb1d (pr18298.03 -> pr18298.04) to prevent the merge conflict with #19689.

@fanquake
Copy link
Member

@hebasto Sorry for the delay. Can you drop the two already-merged commits out of here?

@hebasto
Copy link
Member Author

hebasto commented Sep 15, 2020

Rebased e25cb1d -> 924900e (pr18298.04 -> pr18298.05).

@fanquake

Can you drop the two already-merged commits out of here?

Done. (it was the intention of the previous rebasing, but something gone wrong)

@hebasto
Copy link
Member Author

hebasto commented Nov 25, 2020

@fanquake @laanwj Mind adding 22.0 milestone?

@fanquake
Copy link
Member

fanquake commented Dec 2, 2020

@hebasto taking a look

@dongcarl
Copy link
Contributor

Concept ACK

@theuni
Copy link
Member

theuni commented Dec 11, 2020

From IRC discussion today:

Concept ACK. It would be nice if qt gave the option to disable adding the suffix, but since @hebasto says no such option exists, this seems like a reasonable solution.

Now, if depends is built with DEBUG=1, the configure script correctly
finds Qt for macOS and Windows.
@hebasto
Copy link
Member Author

hebasto commented Jan 8, 2021

Rebased 924900e -> 76f52e3 (pr18298.05 -> pr18298.06) due to the conflict with #19683.

xdustinface pushed a commit to xdustinface/dash that referenced this pull request Feb 17, 2021
…r all hosts including Windows

8a26848 build: Fix m4 escaping (Hennadii Stepanov)
9123ec1 build: Remove extra tokens warning (Hennadii Stepanov)
fded4f4 build: Remove duplicated QT_STATICPLUGIN define (Hennadii Stepanov)
05a93d5 build: Fix indentation in bitcoin_qt.m4 (Hennadii Stepanov)
ddbb419 build: Use pkg-config in BITCOIN_QT_CONFIGURE for all hosts (Hennadii Stepanov)
492971d build: Fix mingw pkgconfig file and dependency naming (Hennadii Stepanov)

Pull request description:

  This PR makes `bitcoin_qt.m4` to use `pkg-config` for all hosts and removes non-pkg-config paths from it. This is a step towards the idea which was clear [stated](bitcoin#8314 (comment)) by Cory Fields:
  > I believe the consensus is to treat Windows like the others and require pkg-config across the board. We can drop all of the non-pkg-config paths, and simply AC_REQUIRE(PKG_PROG_PKG_CONFIG)

  There are two unsolved problems with this PR. If depends is built with `DEBUG=1` the `configure` script fails to pickup Qt:
  - for macOS host (similar to, but not the same as bitcoin#16391)
  - for Windows host (regression)

  The fix is ~on its way~ submitted in bitcoin#18298 (as a followup).

  Also this PR picks some small improvements from bitcoin#17820.

ACKs for top commit:
  theuni:
    Code review ACK 8a26848
  dongcarl:
    Code Review ACK 8a26848
  laanwj:
    Code review ACK 8a26848

Tree-SHA512: 3b25990934b939121983df7707997b31d61063b1207d909f539d69494c7cb85212f353092956d09ecffebb9fef28b869914dd1216a596d102fcb9744bb5487f7
xdustinface pushed a commit to xdustinface/dash that referenced this pull request Feb 17, 2021
… depends with DEBUG=1

Now, if depends is built with DEBUG=1, the configure script correctly
finds Qt for macOS and Windows.
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 76f52e3. Tested native darwin, and darwin/win cross compile with DEBUG=1.

@fanquake fanquake merged commit fca3e98 into bitcoin:master Mar 3, 2021
@hebasto hebasto deleted the 20200309-depends-debug branch March 3, 2021 07:53
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Mar 3, 2021
gades pushed a commit to cosanta/cosanta-core that referenced this pull request Jun 27, 2021
…r all hosts including Windows

8a26848 build: Fix m4 escaping (Hennadii Stepanov)
9123ec1 build: Remove extra tokens warning (Hennadii Stepanov)
fded4f4 build: Remove duplicated QT_STATICPLUGIN define (Hennadii Stepanov)
05a93d5 build: Fix indentation in bitcoin_qt.m4 (Hennadii Stepanov)
ddbb419 build: Use pkg-config in BITCOIN_QT_CONFIGURE for all hosts (Hennadii Stepanov)
492971d build: Fix mingw pkgconfig file and dependency naming (Hennadii Stepanov)

Pull request description:

  This PR makes `bitcoin_qt.m4` to use `pkg-config` for all hosts and removes non-pkg-config paths from it. This is a step towards the idea which was clear [stated](bitcoin#8314 (comment)) by Cory Fields:
  > I believe the consensus is to treat Windows like the others and require pkg-config across the board. We can drop all of the non-pkg-config paths, and simply AC_REQUIRE(PKG_PROG_PKG_CONFIG)

  There are two unsolved problems with this PR. If depends is built with `DEBUG=1` the `configure` script fails to pickup Qt:
  - for macOS host (similar to, but not the same as bitcoin#16391)
  - for Windows host (regression)

  The fix is ~on its way~ submitted in bitcoin#18298 (as a followup).

  Also this PR picks some small improvements from bitcoin#17820.

ACKs for top commit:
  theuni:
    Code review ACK 8a26848
  dongcarl:
    Code Review ACK 8a26848
  laanwj:
    Code review ACK 8a26848

Tree-SHA512: 3b25990934b939121983df7707997b31d61063b1207d909f539d69494c7cb85212f353092956d09ecffebb9fef28b869914dd1216a596d102fcb9744bb5487f7
gades pushed a commit to cosanta/cosanta-core that referenced this pull request Jun 27, 2021
… depends with DEBUG=1

Now, if depends is built with DEBUG=1, the configure script correctly
finds Qt for macOS and Windows.
gades pushed a commit to cosanta/cosanta-core that referenced this pull request Mar 16, 2022
… depends with DEBUG=1

Now, if depends is built with DEBUG=1, the configure script correctly
finds Qt for macOS and Windows.
@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.
Projects
None yet
6 participants