Skip to content

gupnp_1_6: support cross compilation#221308

Merged
Artturin merged 4 commits intoNixOS:stagingfrom
uninsane:pr/sane/cross-gupnp_1_6
Mar 31, 2023
Merged

gupnp_1_6: support cross compilation#221308
Artturin merged 4 commits intoNixOS:stagingfrom
uninsane:pr/sane/cross-gupnp_1_6

Conversation

@uninsane
Copy link
Copy Markdown
Contributor

@uninsane uninsane commented Mar 15, 2023 •
edited
Loading

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
      • also built pkgsCross.aarch64-multiplatform.gupnp_1_6 from x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • 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
    • the output hash for x86_64 doesn't change, so this should be inconsequential to non-cross dependents.
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Mar 15, 2023
NickCao
NickCao reviewed Mar 17, 2023
View reviewed changes
@uninsane uninsane force-pushed the pr/sane/cross-gupnp_1_6 branch from 14b0997 to 5735d3b Compare March 24, 2023 09:28
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Mar 24, 2023
@uninsane uninsane force-pushed the pr/sane/cross-gupnp_1_6 branch from 5735d3b to 4f0c44e Compare March 24, 2023 09:58
@uninsane
Copy link
Copy Markdown
Contributor Author

uninsane commented Mar 24, 2023

oh, this is showing rebuild-linux: 501-1000: should i retarget this against the staging branch?

@uninsane uninsane changed the title gupnp_1_6: support cross compilation by only conditionally building docs gupnp_1_6: support cross compilation Mar 24, 2023
@NickCao
Copy link
Copy Markdown
Member

NickCao commented Mar 24, 2023

oh, this is showing rebuild-linux: 501-1000: should i retarget this against the staging branch?

Yes, and I'd like to wait for the fetchpatch changes to land.

@NickCao NickCao mentioned this pull request Mar 26, 2023
Merged
12 tasks
@Artturin
Copy link
Copy Markdown
Member

Artturin commented Mar 26, 2023

Closing in favor of #223142 which adds a withIntrospection to support cross os compilation

added you to the co-authors of gssdp{_1_6}: enable introspection when cross

Artturin
Artturin reviewed Mar 26, 2023
View reviewed changes
@uninsane uninsane force-pushed the pr/sane/cross-gupnp_1_6 branch from 4f0c44e to 7549df2 Compare March 27, 2023 00:05
@uninsane uninsane marked this pull request as draft March 27, 2023 00:10
@uninsane uninsane force-pushed the pr/sane/cross-gupnp_1_6 branch from 7549df2 to d20bb7f Compare March 27, 2023 00:12
@github-actions github-actions bot added the 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. label Mar 27, 2023
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. labels Mar 27, 2023
@uninsane uninsane changed the base branch from master to staging March 27, 2023 00:13
@github-actions github-actions bot removed 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. labels Mar 27, 2023
@uninsane uninsane marked this pull request as ready for review March 27, 2023 00:14
@uninsane
Copy link
Copy Markdown
Contributor Author

uninsane commented Mar 27, 2023

opened upstream PRs and fixed this changset to use fetchpatch against those instead of ad-hoc patching. rebased against staging. i think i addressed everything?

@Artturin i'm not sure if you intended to close this as part of your comment above (you commented without closing). if you want that, just cherry-pick the fetchpatch stuff into your PR & close this one. but since that one's in draft makes more sense to merge this one IMO.

@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Mar 27, 2023
gnomesysadmins pushed a commit to GNOME/gssdp that referenced this pull request Mar 31, 2023
@uninsane
specify gi-docgen as a native dependency
27863d5 
this allows for cross-compilation.

successfully in use by NixOS/nixpkgs here:
- <NixOS/nixpkgs#221308>

other gnome projects already specifying gi-docgen as native dependency:
- [gtk](https://gitlab.gnome.org/GNOME/gtk/-/blob/8cf3a95d8cd5c79d941b6430f00647caa9b52eb0/docs/reference/meson.build#L4)
- [libadwaita](https://gitlab.gnome.org/GNOME/libadwaita/-/blob/fc27700ea2463c9670cd2fb264697d52cba68b89/doc/meson.build#L27)
- [libhandy](https://gitlab.gnome.org/GNOME/libhandy/-/blob/691fa96e17172a7c1605c59005ea8021cdf3d056/doc/meson.build#L18)
gnomesysadmins pushed a commit to GNOME/gupnp that referenced this pull request Mar 31, 2023
@uninsane
specify gi-docgen as a native dependency
11e2204 
this allows for cross-compilation.

successfully in use by NixOS/nixpkgs here:
- <NixOS/nixpkgs#221308>

other gnome projects already specifying gi-docgen as native dependency:
- [gtk](https://gitlab.gnome.org/GNOME/gtk/-/blob/8cf3a95d8cd5c79d941b6430f00647caa9b52eb0/docs/reference/meson.build#L4)
- [libadwaita](https://gitlab.gnome.org/GNOME/libadwaita/-/blob/fc27700ea2463c9670cd2fb264697d52cba68b89/doc/meson.build#L27)
- [libhandy](https://gitlab.gnome.org/GNOME/libhandy/-/blob/691fa96e17172a7c1605c59005ea8021cdf3d056/doc/meson.build#L18)
@Artturin Artturin merged commit 79260ca into NixOS:staging Mar 31, 2023
@Artturin
Copy link
Copy Markdown
Member

Artturin commented Mar 31, 2023 •
edited
Loading

i think you rebased wrong and that's the reason why there were 5001+ rebuilds labels, though maybe one of these packages is in the stdenv dependency tree and i just don't know it

remember to follow https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#rebasing-between-branches-ie-from-master-to-staging in the future

@FliegendeWurst FliegendeWurst mentioned this pull request Nov 5, 2024
Closed
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@NickCao NickCao NickCao left review comments

@Artturin Artturin Artturin left review comments

@bobby285271 bobby285271 Awaiting requested review from bobby285271

@amaxine amaxine Awaiting requested review from amaxine

@jtojnar jtojnar Awaiting requested review from jtojnar

@hedning hedning Awaiting requested review from hedning

@dasj19 dasj19 Awaiting requested review from dasj19

Assignees

No one assigned

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@uninsane @NickCao @Artturin