Skip to content

qtbase: use more than one core to build qmake#168086

Merged
SuperSandro2000 merged 1 commit intostagingfrom
unknown repository
Apr 13, 2022
Merged

qtbase: use more than one core to build qmake#168086
SuperSandro2000 merged 1 commit intostagingfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Apr 10, 2022 •
edited by ghost
Loading

Description of changes

The qtbase package's configurePhase builds the qmake tool. In the current nixpkgs expression it does this single-threadedly, by invoking make without a -j flag.

Let's thread NIX_BUILD_CORES through to ./configure's invocation of make via the MAKEFLAGS variable.

On high-core-count machines the build of qtbase is much faster with this commit.

Things done
  • Built on platform(s)
    • x86_64-linux (done)
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
    • powerpc64el-linux (done)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: qt/kde Object-oriented framework for GUI creation label Apr 10, 2022
@ghost ghost marked this pull request as ready for review April 10, 2022 02:35
@ghost ghost requested a review from ttuegel as a code owner April 10, 2022 02:35
@ofborg ofborg bot requested review from bkchr, periklis and qknight April 10, 2022 02:45
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Apr 10, 2022
@Artturin Artturin self-requested a review April 10, 2022 09:36
SuperSandro2000
SuperSandro2000 approved these changes Apr 11, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

LGTM but due to the amount of rebuilds this should go to staging.

@ghost ghost changed the base branch from master to staging April 12, 2022 04:08
@ghost
Copy link
Copy Markdown
Author

ghost commented Apr 12, 2022

LGTM but due to the amount of rebuilds this should go to staging.

Done.

SuperSandro2000
SuperSandro2000 reviewed Apr 12, 2022
View reviewed changes
@ghost
Copy link
Copy Markdown
Author

ghost commented Apr 12, 2022

Squashed.

@SuperSandro2000
qtbase: use more than one core to build qmake
8660a09 
The qtbase package's `configurePhase` builds the `qmake` tool.  In the
current nixpkgs expression it does this single-threadedly, by invoking
`make` without a `-j` flag.

Let's thread `NIX_BUILD_CORES` through to `./configure`'s invocation
of `make` via the `MAKEFLAGS` variable.

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
@Artturin
Copy link
Copy Markdown
Member

Artturin commented Apr 13, 2022 •
edited by SuperSandro2000
Loading

@ofborg build qt5.qtbase

@SuperSandro2000 SuperSandro2000 merged commit 4c8c13b into NixOS:staging Apr 13, 2022
@ghost ghost deleted the qtbase-use-parallel-make branch April 13, 2022 10:41
@Artturin Artturin mentioned this pull request Jan 29, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ttuegel ttuegel Awaiting requested review from ttuegel

@periklis periklis Awaiting requested review from periklis

@bkchr bkchr Awaiting requested review from bkchr

@qknight qknight Awaiting requested review from qknight

@Artturin Artturin Awaiting requested review from Artturin

Assignees

No one assigned

Labels

6.topic: qt/kde Object-oriented framework for GUI creation 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Artturin @SuperSandro2000