build: use more legible (q)make commands in qt package

fanquake commented at 8:21 am on November 26, 2020: 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.

build: use more legible commands in qt package

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.

944b126617

fanquake added the label Build system on Nov 26, 2020

fanquake added the label Needs gitian build on Nov 26, 2020

hebasto commented at 8:38 am on November 26, 2020: member

Concept ACK on removing fences of ../ :)

practicalswift commented at 8:40 am on November 26, 2020: contributor

cr ACK 944b1266171d9e555133a1b41071fe2e70623a14: patch looks correct

jonasschnelli commented at 9:04 am on November 26, 2020: contributor

Thanks! utACK 944b1266171d9e555133a1b41071fe2e70623a14

hebasto commented at 9:15 am on November 26, 2020: member

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

EDITED: nm, -o Makefile is expilicit enough.

fanquake commented at 1:16 pm on November 26, 2020: member

The macOS build has thrown a spanner in the works:

0x86_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
1make[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 commented at 1:23 pm on November 26, 2020: member

The macOS build has thrown a spanner in the works:

0x86_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
1make[2]: x86_64-apple-darwin18-ar: Command not found

Mind testing along with #19882?

DrahtBot commented at 2:51 pm on November 26, 2020: 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:

#20673 (depends: Use more legible qmake commands in qt package by hebasto)
#20642 (depends: Drop unneeded patches for qt package by hebasto)
#20641 (depends: Use Qt top-level build facilities by hebasto)

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 commented at 9:12 am on November 27, 2020: member

The macOS build has thrown a spanner in the works:
0x86_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
1make[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 commented at 0:19 am on November 29, 2020: member

Gitian builds

File	commit e2ff5e7b35d71195278d2a2ed9485f141de33d7a(master)	commit e04a05c5d0cb1444c3aa83ba5ea4c41430ab36f7(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...`

DrahtBot removed the label Needs gitian build on Nov 29, 2020

BlockMechanic commented at 4:55 pm on December 7, 2020: contributor

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

hebasto commented at 2:43 pm on December 13, 2020: member

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

See #20673.

fanquake commented at 5:18 am on December 17, 2020: member

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

fanquake closed this on Dec 17, 2020

fanquake referenced this in commit 1b31695c74 on Dec 25, 2020

sidhujag referenced this in commit ea50da735d on Dec 25, 2020

fanquake locked this on Feb 22, 2021

fanquake deleted the branch on Feb 22, 2021

build: use more legible (q)make commands in qt package #20504

Conflicts

Gitian builds