Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

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

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

Merged
merged 12 commits into from
Dec 2, 2024
Merged

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

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b9aeb52
GH-127429: fix sysconfig data generation on cross-builds
FFY00 Nov 29, 2024
6d6c5f3
Add news
FFY00 Nov 29, 2024
8166e9a
Fix news' rst
FFY00 Nov 29, 2024
d10a369
Remove whitespace in .github/workflows/jit.yml to trigger the JIT tes…
FFY00 Nov 29, 2024
53dbc14
Load the prefixes for sysconfig data from the Makefile when cross-com…
FFY00 Nov 30, 2024
dc3bf73
Keep _init_non_posix after the main initialization
FFY00 Nov 30, 2024
02697aa
Minor code reformating
FFY00 Nov 30, 2024
c18ed8c
Print generated file names on --generate-posix-vars
FFY00 Nov 30, 2024
ad995af
Fix pybuilddir on debug cross-builds
FFY00 Nov 30, 2024
27a4cd1
Disable caching in HOSTRUNNER
FFY00 Nov 30, 2024
cc4f57a
Update autotools files
FFY00 Nov 30, 2024
0184295
Fix get_config_var('abiflags') in cross-builds
FFY00 Dec 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix get_config_var('abiflags') in cross-builds 
Signed-off-by: Filipe Laíns <lains@riseup.net>
  • Loading branch information
@FFY00
FFY00 committed Dec 1, 2024
commit 0184295f4a6bd7f22bc52b0ec21b27d8a3661855
12 changes: 7 additions & 5 deletions 12 Lib/sysconfig/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,11 @@ def _init_config_vars():
base_prefix = _BASE_PREFIX
base_exec_prefix = _BASE_EXEC_PREFIX

try:
abiflags = sys.abiflags
except AttributeError:
abiflags = ''

if os.name == 'posix':
_init_posix(_CONFIG_VARS)
# If we are cross-compiling, load the prefixes from the Makefile instead.
Expand All @@ -486,6 +491,7 @@ def _init_config_vars():
exec_prefix = _CONFIG_VARS['exec_prefix']
base_prefix = _CONFIG_VARS['prefix']
base_exec_prefix = _CONFIG_VARS['exec_prefix']
abiflags = _CONFIG_VARS['ABIFLAGS']

# Normalized versions of prefix and exec_prefix are handy to have;
# in fact, these are the standard versions used most places in the
Expand All @@ -503,11 +509,7 @@ def _init_config_vars():
_CONFIG_VARS['platlibdir'] = sys.platlibdir
_CONFIG_VARS['implementation'] = _get_implementation()
_CONFIG_VARS['implementation_lower'] = _get_implementation().lower()
try:
_CONFIG_VARS['abiflags'] = sys.abiflags
except AttributeError:
# sys.abiflags may not be defined on all platforms.
_CONFIG_VARS['abiflags'] = ''
_CONFIG_VARS['abiflags'] = abiflags
try:
_CONFIG_VARS['py_version_nodot_plat'] = sys.winver.replace('.', '')
except AttributeError:
Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.