From 8d8be982289f3f4ae67959c1754e6d92ec1d7dd7 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 28 Jun 2024 23:15:58 +0100 Subject: [PATCH] Drop Python path override hack in profile.bashrc This hasn't been needed for a while, since Gentoo started handling Python modules according to PEP 517. We now need util-linux with Python support for Catalyst 4, and this hack erroneously causes the module to be installed under /usr/lib64 rather than /usr/lib. Signed-off-by: James Le Cuirot --- .../profiles/coreos/base/profile.bashrc | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc index e686af5419..7abb2c7af0 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc @@ -71,23 +71,6 @@ cros_setup_hooks() { } cros_setup_hooks -# Packages that use python will run a small python script to find the -# pythondir. Unfortunately, they query the host python to find out the -# paths for things, which means they inevitably guess wrong. Export -# the cached values ourselves and since we know these are going through -# autoconf, we can leverage ${libdir} that econf sets up automatically. -cros_pre_src_unpack_python_multilib_setup() { - # Avoid executing multiple times in a single build. - [[ ${am_cv_python_version:+set} == "set" ]] && return - - local py=${PYTHON:-python} - local py_ver=$(${py} -c 'import sys;sys.stdout.write(sys.version[:4])') - - export am_cv_python_version=${py_ver} - export am_cv_python_pythondir="\${libdir}/python${py_ver}/site-packages" - export am_cv_python_pyexecdir=${am_cv_python_pythondir} -} - # Since we're storing the wrappers in a board sysroot, make sure that # is actually in our PATH. cros_pre_pkg_setup_sysroot_build_bin_dir() {