From d67c558126bdd960575bdabc6ffa6cfffe27c64c Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 9 Nov 2021 13:54:24 +0100 Subject: [PATCH] eclass/bash_completion-r1: Backport the fix for paths from systemd.eclass The paths returned by pkg-config seem to have sysroot prepended twice. The systemd eclass has a workaround for that - use it for bash completion files too, then. --- .../portage-stable/eclass/bash-completion-r1.eclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass index e966b8709b..01899635de 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass @@ -45,6 +45,11 @@ inherit toolchain-funcs _bash-completion-r1_get_bashdir() { debug-print-function ${FUNCNAME} "${@}" + # Flatcar: Take a fix for pkg-config paths from systemd.eclass. + # + # https://github.com/pkgconf/pkgconf/issues/205 + local -x PKG_CONFIG_FDO_SYSROOT_RULES=1 + if $(tc-getPKG_CONFIG) --exists bash-completion &>/dev/null; then local path path=$($(tc-getPKG_CONFIG) --variable="${1}" bash-completion) || die