Skip to content

Conversation

fanquake
Copy link
Member

Rather than using cd to jump all over the place, move up out of
qtbase first, and perform all (q)make commands from the
top level directory. This is worst in the config commands.

Looking at bash like cd ../../../.. gives me a headache.

Rather than using cd to jump all over the place, move up out of
qtbase first, and perform all commands from the top level directory.
@hebasto
Copy link
Member

hebasto commented Nov 26, 2020

Concept ACK on removing fences of ../ :)

@practicalswift
Copy link
Contributor

cr ACK 944b126: patch looks correct

@jonasschnelli
Copy link
Contributor

Thanks!
utACK 944b126

@hebasto
Copy link
Member

hebasto commented Nov 26, 2020

While touching those lines maybe pass the -makefile mode to qmake explicitly?

EDITED: nm, -o Makefile is expilicit enough.

@fanquake
Copy link
Member Author

The macOS build has thrown a spanner in the works:

x86_64-apple-darwin18-ar cq ../../../lib/libqtlibpng.a .obj/png.o .obj/pngerror.o .obj/pngget.o .obj/pngmem.o .obj/pngpread.o .obj/pngread.o .obj/pngrio.o .obj/pngrtran.o .obj/pngrutil.o .obj/pngset.o .obj/pngtrans.o .obj/pngwio.o .obj/pngwrite.o .obj/pngwtran.o .obj/pngwutil.o
make[2]: x86_64-apple-darwin18-ar: Command not found

While touching those lines maybe pass the -makefile mode to qmake explicitly?

Sure. I'll look at that while fixing the macOS issue.

@hebasto
Copy link
Member

hebasto commented Nov 26, 2020

The macOS build has thrown a spanner in the works:

x86_64-apple-darwin18-ar cq ../../../lib/libqtlibpng.a .obj/png.o .obj/pngerror.o .obj/pngget.o .obj/pngmem.o .obj/pngpread.o .obj/pngread.o .obj/pngrio.o .obj/pngrtran.o .obj/pngrutil.o .obj/pngset.o .obj/pngtrans.o .obj/pngwio.o .obj/pngwrite.o .obj/pngwtran.o .obj/pngwutil.o
make[2]: x86_64-apple-darwin18-ar: Command not found

Mind testing along with #19882?

@DrahtBot
Copy link
Contributor

DrahtBot commented Nov 26, 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

hebasto commented Nov 27, 2020

The macOS build has thrown a spanner in the works:

x86_64-apple-darwin18-ar cq ../../../lib/libqtlibpng.a .obj/png.o .obj/pngerror.o .obj/pngget.o .obj/pngmem.o .obj/pngpread.o .obj/pngread.o .obj/pngrio.o .obj/pngrtran.o .obj/pngrutil.o .obj/pngset.o .obj/pngtrans.o .obj/pngwio.o .obj/pngwrite.o .obj/pngwtran.o .obj/pngwutil.o
make[2]: x86_64-apple-darwin18-ar: Command not found

Mind testing along with #19882?

@fanquake
The combined commits build is here: https://cirrus-ci.com/task/5002113291911168

@DrahtBot
Copy link
Contributor

Gitian builds

File commit e2ff5e7
(master)
commit e04a05c
(master and this pull)
bitcoin-core-linux-22-res.yml 44e52af36236879f... f30b3ee428851214...
bitcoin-core-osx-22-res.yml 71d5fb0e6642d6b0...
bitcoin-core-win-22-res.yml 0148a2f5e7295184... bb587dfa740fc07a...
*-aarch64-linux-gnu-debug.tar.gz 383e84aaa96f342a... 1edf6b506a175747...
*-aarch64-linux-gnu.tar.gz 3558211891c0484a... e325956e10b0464f...
*-arm-linux-gnueabihf-debug.tar.gz 5ebbb475a590480a... f88c807624af813c...
*-arm-linux-gnueabihf.tar.gz 60951d893e2688b6... da844ad5e8b2f285...
*-osx-unsigned.dmg 7cba6edda598c96c...
*-osx64.tar.gz ea2ab5c893780a2e...
*-riscv64-linux-gnu-debug.tar.gz 0c20a43923efcd5f... 7cbe3082be68c43e...
*-riscv64-linux-gnu.tar.gz 8d3632d81c77eff1... af99247802d4a3d6...
*-win64-debug.zip 72c35e133cf9a0db... 240f2bdbe57be311...
*-win64-setup-unsigned.exe 55c17bfff54273e5... 4a4c1a3a98dc7168...
*-win64.zip f7bf6737c7f741c3... bba73fcdb6be9601...
*-x86_64-linux-gnu-debug.tar.gz abf91baef5c44686... ffe99101bb72a5f3...
*-x86_64-linux-gnu.tar.gz 75fda490174df335... 893186e5d0f0f82a...
*.tar.gz 793a2c7af39452d5... a9e853e9e9f0342e...
linux-build.log 9c5461a914e1f4c0... 2d661dfe86d81873...
osx-build.log 5adaf67afbaf00fc... 44121d514dd84780...
win-build.log 756101ecccffabf0... 144ba8c30ece0e34...
bitcoin-core-linux-22-res.yml.diff c0b6b0581604c4d0...
bitcoin-core-win-22-res.yml.diff c0c9b7f55178a4fa...
linux-build.log.diff 7034b01f3a469b88...
osx-build.log.diff 29c8fec849524980...
win-build.log.diff 86941848e43858d3...

@BlockMechanic
Copy link
Contributor

Simple yet meaningful! It makes it easier to read and understand. 100% support this PR

@hebasto
Copy link
Member

hebasto commented Dec 13, 2020

@fanquake Changes from this PR are incorporated into #20642 which is based on #20641.

See #20673.

@fanquake
Copy link
Member Author

Going to close this in favour of #20673, which includes this change + another.

@fanquake fanquake closed this Dec 17, 2020
fanquake added a commit to bitcoin-core/gui that referenced this pull request Dec 25, 2020
87fe104 depends: Use more legible qmake commands in qt package (Hennadii Stepanov)
bf35a8d depends: Do not set build_subdir for qt package (Hennadii Stepanov)

Pull request description:

  Rather than using `cd` to jump all over the place, perform all `(q)make` commands from the top level directory.

  Looking at bash like `cd ../../../..` gives me a headache.

  Credits to **fanquake**.

  This PR is an alternative to #20504 that works without any additional [non-trivial hack](bitcoin/bitcoin#20504 (comment)).

ACKs for top commit:
  promag:
    Tested ACK 87fe104.
  fanquake:
    ACK 87fe104

Tree-SHA512: 1d2a13b5358fc7406c5363ddd62fd363dbc0ec5ace68946e4d3e6e8620419afaa64ef2837488aaed226174e01e8897495085540f7126b80f8b2372d21b5b29f9
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Dec 25, 2020
…ackage

87fe104 depends: Use more legible qmake commands in qt package (Hennadii Stepanov)
bf35a8d depends: Do not set build_subdir for qt package (Hennadii Stepanov)

Pull request description:

  Rather than using `cd` to jump all over the place, perform all `(q)make` commands from the top level directory.

  Looking at bash like `cd ../../../..` gives me a headache.

  Credits to **fanquake**.

  This PR is an alternative to bitcoin#20504 that works without any additional [non-trivial hack](bitcoin#20504 (comment)).

ACKs for top commit:
  promag:
    Tested ACK 87fe104.
  fanquake:
    ACK 87fe104

Tree-SHA512: 1d2a13b5358fc7406c5363ddd62fd363dbc0ec5ace68946e4d3e6e8620419afaa64ef2837488aaed226174e01e8897495085540f7126b80f8b2372d21b5b29f9
@bitcoin bitcoin locked and limited conversation to collaborators Feb 22, 2021
@fanquake fanquake deleted the legible_qt_config_cmds branch February 22, 2021 07:26
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.

6 participants