Skip to content

btrfs-progs: allow to build without python bindings#186527

Merged
ck3d merged 1 commit intomasterfrom
unknown repository
Sep 2, 2022
Merged

btrfs-progs: allow to build without python bindings#186527
ck3d merged 1 commit intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Aug 13, 2022

Description of changes

Python cross-compilation is quite difficult, and doesn't work in several situations, such as:

#186525

Let's give people the option of cross-compiling btrfs-progs to hostPlatforms for which we cannot cross-compile python. Unfortunately btrfs-progs insists on a special configure flag --disable-python; simply being unable to find python isn't enough.

Things done
  • Built on platform(s)
    • mips64el-linux-gnuabin32 (cross from powerpc64le-linux)
  • 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
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from 7c6f434c August 13, 2022 22:39
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 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. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Aug 13, 2022
@7c6f434c
Copy link
Copy Markdown
Member

@ofborg eval

@7c6f434c
Copy link
Copy Markdown
Member

Hm, it sounds like the second commit does more than the commit message claims and then the third commit undos the part actually in the commit message? Maybe squash then?

@ghost ghost marked this pull request as draft August 17, 2022 17:25
@ghost
Copy link
Copy Markdown
Author

ghost commented Aug 17, 2022

Yeah sorry the second commit was made in order to reduce the rebuilds to zero (so ofborg would remove the "red oval of shame" from my PR), and then the third commit reverted some parts of the second commit that turned out not to be necessary.

In any event: squashed.

@ghost ghost marked this pull request as ready for review August 17, 2022 17:27
Copy link
Copy Markdown
Contributor

@ck3d ck3d left a comment

Choose a reason for hiding this comment

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

LGTM

@bobby285271 bobby285271 added the 12.approvals: 1 This PR was reviewed and approved by one person. label Aug 22, 2022
@7c6f434c 7c6f434c added the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 22, 2022
@ghost ghost marked this pull request as draft September 1, 2022 04:10
@ghost ghost marked this pull request as ready for review September 1, 2022 04:10
@ghost
Copy link
Copy Markdown
Author

ghost commented Sep 1, 2022

Merge conflict resolved.

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 1, 2022
Copy link
Copy Markdown
Contributor

@ck3d ck3d left a comment

Choose a reason for hiding this comment

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

I seems you merged master into your branch. Could you please make a rebase on master instead.

@ghost ghost marked this pull request as draft September 1, 2022 05:34
Python cross-compilation is quite difficult, and doesn't work in
several situations, such as:

#186525

Let's give people the option of cross-compiling `btrfs-progs` to
hostPlatforms for which we cannot cross-compile python.  Unfortunately
btrfs-progs insists on a special configure flag `--disable-python`;
simply being unable to find python isn't enough.
@ghost ghost marked this pull request as ready for review September 1, 2022 05:36
@ghost ghost requested review from ck3d and removed request for 7c6f434c and ck3d September 1, 2022 05:36
@bobby285271 bobby285271 removed the 12.approvals: 1 This PR was reviewed and approved by one person. label Sep 1, 2022
@rapenne-s
Copy link
Copy Markdown
Member

Result of nixpkgs-review pr 186527 run on x86_64-linux 1

@bobby285271 bobby285271 added the 12.approvals: 1 This PR was reviewed and approved by one person. label Sep 1, 2022
@ghost
Copy link
Copy Markdown
Author

ghost commented Sep 1, 2022

I seems you merged master into your branch. Could you please make a rebase on master instead.

Done.

@ck3d ck3d merged commit 7d9947f into NixOS:master Sep 2, 2022
@ghost ghost deleted the pr/btrfs-progs/enablePython branch January 23, 2024 06:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants