Skip to content

Commit

Permalink
Drop Python path override hack in profile.bashrc
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
chewi committed Jul 11, 2024
1 parent fc96b0c commit 78d8cbd
Showing 1 changed file with 0 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit 78d8cbd

Please sign in to comment.