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.

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

qt5.qtbase: backport cmake macro fix (unbreaks FreeCAD build) #80579

Merged
merged 1 commit into from Feb 24, 2020
Merged

qt5.qtbase: backport cmake macro fix (unbreaks FreeCAD build) #80579

merged 1 commit into from Feb 24, 2020

Conversation

mmilata
Copy link
Member

@mmilata mmilata commented Feb 19, 2020

Backport fix of QT5_MAKE_OUTPUT_FILE CMake macro which causes FreeCAD build failure when building with qt-5.12.7: https://hydra.nixos.org/build/113081790

It's possible use local copy of the macro in the FreeCAD package instead but I figured this might unbreak some other builds. Not sure if the high number of rebuilds is worth it - let me know what you think.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@mmilata
qt5.qtbase: backport cmake macro fix
80650ae 
Backport fix of QT5_MAKE_OUTPUT_FILE CMake macro which causes FreeCAD
build failure when building with qt-5.12.7.

https://bugreports.qt.io/browse/QTBUG-81715
@FRidh FRidh added this to WIP in Staging via automation Feb 20, 2020
@FRidh FRidh moved this from WIP to Needs review in Staging Feb 20, 2020
Staging automation moved this from Needs review to Ready Feb 24, 2020
@ttuegel ttuegel merged commit 2cb48bb into NixOS:staging Feb 24, 2020
Staging automation moved this from Ready to Done Feb 24, 2020
@mmilata mmilata mentioned this pull request Feb 24, 2020
Closed
10 tasks
@mmilata mmilata deleted the qt5-cmake-fix branch February 24, 2020 15:58
@mmilata mmilata mentioned this pull request Mar 13, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ttuegel ttuegel ttuegel approved these changes

Assignees
No one assigned
Labels
6.topic: qt/kde 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
Staging
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mmilata @ttuegel