Skip to content

[Backport staging-22.05] python3Packages.setuptools: add distutils patch to support cross-compilation#181734

Merged
vcunat merged 1 commit intostaging-22.05from
backport-173435-to-staging-22.05
Jul 18, 2022
Merged

[Backport staging-22.05] python3Packages.setuptools: add distutils patch to support cross-compilation#181734
vcunat merged 1 commit intostaging-22.05from
backport-173435-to-staging-22.05

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

Bot-based backport to staging-22.05, triggered by a label in #173435.

  • Before merging, ensure that this backport complies with the Criteria for Backporting.
    • Even as a non-commiter, if you find that it does not comply, leave a comment.

…ilation

This is mostly the same patch applied to stdlib distutils, except rebased
and reworked a bit. This fixes cross-compilation of Python packages with
C extension modules now that setuptools uses bundled distutils.

(cherry picked from commit 2294dac)
@github-actions github-actions bot requested review from FRidh and jonringer as code owners July 16, 2022 14:13
@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: 5001+ This PR causes many rebuilds on Darwin and must 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: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jul 16, 2022
@squalus
Copy link
Copy Markdown
Member

squalus commented Jul 17, 2022

Since this is the stable branch, is it worth making this conditional on a cross platform to avoid the mass rebuild?

@squalus squalus added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Jul 17, 2022
@ck3d
Copy link
Copy Markdown
Contributor

ck3d commented Jul 17, 2022

Good point. Since I have no rights to change this branch, I create a commit on my repository. Can some please cherry pick following commit ck3d@850d494

@bjornfor
Copy link
Copy Markdown
Contributor

The PR targets branch staging-22.05, isn't that good enough? (I personally prefer rebuilds over diverging branches.)

@risicle
Copy link
Copy Markdown
Contributor

risicle commented Jul 17, 2022

As @bjornfor says, this will likely only get introduced to hydra along with other big rebuilds so shouldn't really cause any extra builds.

Can confirm this allows lxml to be built on nixos x86_64 via pkgsCross.aarch64-multiplatform.

@vcunat vcunat merged commit ea9ff78 into staging-22.05 Jul 18, 2022
@vcunat vcunat deleted the backport-173435-to-staging-22.05 branch July 18, 2022 08:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 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: 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants