Skip to content

Comments

GH-127429: fix sysconfig data generation on cross-builds#127430

Merged
FFY00 merged 12 commits intopython:mainfrom
FFY00:gh-127429
Dec 2, 2024
Merged

GH-127429: fix sysconfig data generation on cross-builds#127430
FFY00 merged 12 commits intopython:mainfrom
FFY00:gh-127429

Conversation

@FFY00
Copy link
Member

@FFY00 FFY00 commented Nov 29, 2024 •
edited by bedevere-app bot
Loading

FFY00 added 2 commits November 29, 2024 22:57
@FFY00
pythonGH-127429: fix sysconfig data generation on cross-builds
b9aeb52 
Signed-off-by: Filipe Laíns <lains@riseup.net>
@FFY00
Add news
6d6c5f3 
Signed-off-by: Filipe Laíns <lains@riseup.net>
@FFY00 FFY00 added needs backport to 3.12 only security fixes needs backport to 3.13 bugs and security fixes labels Nov 29, 2024
@bedevere-app bedevere-app bot mentioned this pull request Nov 29, 2024
Closed
@FFY00
Copy link
Member Author

FFY00 commented Nov 29, 2024

@nascheme, this should fix the JIT tests.

FFY00 added 2 commits November 29, 2024 23:05
@FFY00
Fix news' rst
8166e9a 
Signed-off-by: Filipe Laíns <lains@riseup.net>
@FFY00
Remove whitespace in .github/workflows/jit.yml to trigger the JIT tes…
d10a369 
…ts :)

Signed-off-by: Filipe Laíns <lains@riseup.net>
FFY00 added 3 commits November 30, 2024 00:25
@FFY00
Load the prefixes for sysconfig data from the Makefile when cross-com…
53dbc14 
…piling

Signed-off-by: Filipe Laíns <lains@riseup.net>
@FFY00
Keep _init_non_posix after the main initialization
dc3bf73 
Signed-off-by: Filipe Laíns <lains@riseup.net>
@FFY00
Minor code reformating
02697aa 
Signed-off-by: Filipe Laíns <lains@riseup.net>
@FFY00
Copy link
Member Author

FFY00 commented Nov 30, 2024 •
edited
Loading

Alright, the tests seem to be passing 😄

@FFY00
Copy link
Member Author

FFY00 commented Nov 30, 2024

Okay, there seems to be an issue still:

======================================================================
ERROR: test_sysconfigdata_json (test.test_sysconfig.TestSysConfig.test_sysconfigdata_json)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/runner/work/cpython/cpython/Lib/test/test_sysconfig.py", line 644, in test_sysconfigdata_json
    with open(json_data_path) as f:
         ~~~~^^^^^^^^^^^^^^^^
FileNotFoundError: [Errno 2] No such file or directory: '/home/runner/work/cpython/cpython/build/lib.linux-aarch64-3.14-pydebug/_sysconfig_vars_d_linux_aarch64-linux-gnu.json'
----------------------------------------------------------------------

@FFY00

This comment was marked as outdated.

Sign in to view
FFY00 added 2 commits November 30, 2024 02:06
@FFY00
Print generated file names on --generate-posix-vars
c18ed8c 
Signed-off-by: Filipe Laíns <lains@riseup.net>
@FFY00
Fix pybuilddir on debug cross-builds
ad995af 
Signed-off-by: Filipe Laíns <lains@riseup.net>
@FFY00
Copy link
Member Author

FFY00 commented Nov 30, 2024

It seems like _get_pybuilddir was using a runtime check, which reflected the host on cross-builds.

@FFY00
Disable caching in HOSTRUNNER
27a4cd1 
Signed-off-by: Filipe Laíns <lains@riseup.net>
FFY00 added 2 commits November 30, 2024 02:52
@FFY00
Update autotools files
cc4f57a 
Signed-off-by: Filipe Laíns <lains@riseup.net>
@FFY00
Fix get_config_var('abiflags') in cross-builds
0184295 
Signed-off-by: Filipe Laíns <lains@riseup.net>
@FFY00
Copy link
Member Author

FFY00 commented Dec 1, 2024

Oh, yay, all tests pass, that wasn't much fun to debug 😅

@FFY00 FFY00 merged commit 2950bc5 into python:main Dec 2, 2024
@FFY00 FFY00 deleted the gh-127429 branch December 2, 2024 07:12
@miss-islington-app
Copy link

miss-islington-app bot commented Dec 2, 2024

Thanks @FFY00 for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13.
🐍🍒⛏🤖

@miss-islington-app
Copy link

miss-islington-app bot commented Dec 2, 2024

Sorry, @FFY00, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 2950bc50af8fc2539e64731359bfb39b335a614d 3.13

@miss-islington-app
Copy link

miss-islington-app bot commented Dec 2, 2024

Sorry, @FFY00, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 2950bc50af8fc2539e64731359bfb39b335a614d 3.12

picnixz pushed a commit to picnixz/cpython that referenced this pull request Dec 2, 2024
@FFY00 @picnixz
pythonGH-127429: fix sysconfig data generation on cross-builds (pytho…
f31ed8d 
…n#127430)
@FFY00 FFY00 mentioned this pull request Dec 10, 2024
Closed
srinivasreddy pushed a commit to srinivasreddy/cpython that referenced this pull request Jan 8, 2025
@FFY00 @srinivasreddy
pythonGH-127429: fix sysconfig data generation on cross-builds (pytho…
1845e3a 
…n#127430)
ebonnal pushed a commit to ebonnal/cpython that referenced this pull request Jan 12, 2025
@FFY00 @ebonnal
pythonGH-127429: fix sysconfig data generation on cross-builds (pytho…
c41bb29 
…n#127430)
@hugovk
Copy link
Member

hugovk commented Feb 26, 2025

@FFY00 Triage: please could you make the backports if they're still needed? Otherwise let's remove the labels.

hugovk pushed a commit to hugovk/cpython that referenced this pull request Mar 6, 2025
@FFY00 @hugovk
[3.13] pythonGH-127429: fix sysconfig data generation on cross-builds (…
fd6ac9b 
…pythonGH-127430)

(cherry picked from commit 2950bc5)

Co-authored-by: Filipe Laíns 🇵🇸 <lains@riseup.net>
XuehaiPan
XuehaiPan reviewed Mar 29, 2025
View reviewed changes
Lib/sysconfig/__main__.py
def _get_pybuilddir():
pybuilddir = f'build/lib.{get_platform()}-{get_python_version()}'
if hasattr(sys, "gettotalrefcount"):
if get_config_var('Py_DEBUG') == '1':
Copy link
Contributor

@XuehaiPan XuehaiPan Mar 29, 2025

Choose a reason for hiding this comment

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

get_config_var('Py_DEBUG') is an int rather than str.

XuehaiPan added a commit to XuehaiPan/cpython that referenced this pull request Apr 1, 2025
@XuehaiPan
Revert back to pre pythonGH-127430
1bd31c4
@hugovk hugovk removed the needs backport to 3.12 only security fixes label Apr 8, 2025
@hugovk hugovk removed the needs backport to 3.13 bugs and security fixes label May 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@brandtbucher brandtbucher Awaiting requested review from brandtbucher

@savannahostrowski savannahostrowski Awaiting requested review from savannahostrowski

@erlend-aasland erlend-aasland Awaiting requested review from erlend-aasland erlend-aasland is a code owner

@corona10 corona10 Awaiting requested review from corona10 corona10 is a code owner

1 more reviewer

@XuehaiPan XuehaiPan XuehaiPan left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@FFY00 FFY00

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@FFY00 @hugovk @XuehaiPan