git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 801b64480490e99c5eb062401149d1f1a945e8f8 Mon Sep 17 00:00:00 2001
   2 From: Alexander Kanavin <alex@linutronix.de>
   3 Date: Wed, 11 May 2022 21:41:14 +0200
   4 Subject: [PATCH] _distutils/sysconfig.py: make it possible to substite the
   5  prefix to target sysroot
   6
   7 This is done by probing STAGING_INCDIR/STAGING_LIBDIRenv vars:
   8 not the most elegant solution, but distutils/sysconfig has been
   9 tweaked to do this for many, many year, and so it's easiest
  10 to replicate here as well, the original is
  11 meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
  12
  13 I'm not sure exactly why setuptools now needs a copy, and what
  14 would happen to this module in light of distutils deprecation.
  15
  16 Upstream-Status: Inappropriate [oe-core specific]
  17 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
  18 ---
  19  setuptools/_distutils/sysconfig.py | 12 ++++++++++--
  20  1 file changed, 10 insertions(+), 2 deletions(-)
  21
  22 diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py
  23 index ef3def8..577d320 100644
  24 --- a/setuptools/_distutils/sysconfig.py
  25 +++ b/setuptools/_distutils/sysconfig.py
  26 @@ -122,6 +122,8 @@ def get_python_inc(plat_specific=False, prefix=None):
  27      sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
  28      """
  29      default_prefix = BASE_EXEC_PREFIX if plat_specific else BASE_PREFIX
  30 +    if os.environ.get('STAGING_INCDIR', ""):
  31 +        default_prefix = os.environ['STAGING_INCDIR'].rstrip('include')
  32      resolved_prefix = prefix if prefix is not None else default_prefix
  33      # MinGW imitates posix like layout, but os.name != posix
  34      os_name = "posix" if is_mingw() else os.name
  35 @@ -242,7 +244,13 @@ def get_python_lib(plat_specific=False, standard_lib=False, prefix=None):
  36
  37      early_prefix = prefix
  38
  39 -    if prefix is None:
  40 +    if os.environ.get('STAGING_LIBDIR', ""):
  41 +        lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1]
  42 +    else:
  43 +        lib_basename = "lib"
  44 +    if prefix is None and os.environ.get('STAGING_LIBDIR', ""):
  45 +        prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename)
  46 +    elif prefix is None:
  47          if standard_lib:
  48              prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
  49          else:
  50 @@ -257,7 +265,7 @@ def get_python_lib(plat_specific=False, standard_lib=False, prefix=None):
  51              # Pure Python
  52              libdir = "lib"
  53          implementation = 'pypy' if IS_PYPY else 'python'
  54 -        libpython = os.path.join(prefix, libdir, implementation + get_python_version())
  55 +        libpython = os.path.join(prefix, lib_basename, implementation + get_python_version())
  56          return _posix_lib(standard_lib, libpython, early_prefix, prefix)
  57      elif os.name == "nt":
  58          if standard_lib: