diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-10-03 23:49:50 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-10-03 23:49:50 +0100 |
commit | c410d7a91a496a4fbbca686c80f7446305222d55 (patch) | |
tree | 8ba974498cd1061dd4e883a34bd5e9be93a95214 /dev-util/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch | |
parent | c99c2410831577bef101e22948e954f85f56cba1 (diff) |
gentoo auto-resync : 03:10:2023 - 23:49:49
Diffstat (limited to 'dev-util/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch')
-rw-r--r-- | dev-util/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/dev-util/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch b/dev-util/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch new file mode 100644 index 000000000000..484e967c8328 --- /dev/null +++ b/dev-util/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch @@ -0,0 +1,36 @@ +From c179c18765514d5c37737dec996b4c91cb31477f Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Mon, 2 Oct 2023 16:40:15 -0400 +Subject: [PATCH 3/7] python module: refactor pypy detection into a consistent + variable + +(cherry picked from commit 3d3a10ef022284c8377bd9f8e1b1adec73c50d95) +--- + mesonbuild/scripts/python_info.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/mesonbuild/scripts/python_info.py b/mesonbuild/scripts/python_info.py +index 65597b121..d17b3a376 100755 +--- a/mesonbuild/scripts/python_info.py ++++ b/mesonbuild/scripts/python_info.py +@@ -72,6 +72,8 @@ def links_against_libpython(): + variables = sysconfig.get_config_vars() + variables.update({'base_prefix': getattr(sys, 'base_prefix', sys.prefix)}) + ++is_pypy = '__pypy__' in sys.builtin_module_names ++ + if sys.version_info < (3, 0): + suffix = variables.get('SO') + elif sys.version_info < (3, 8, 7): +@@ -88,7 +90,7 @@ print(json.dumps({ + 'install_paths': install_paths, + 'version': sysconfig.get_python_version(), + 'platform': sysconfig.get_platform(), +- 'is_pypy': '__pypy__' in sys.builtin_module_names, ++ 'is_pypy': is_pypy, + 'is_venv': sys.prefix != variables['base_prefix'], + 'link_libpython': links_against_libpython(), + 'suffix': suffix, +-- +2.42.0 + |