From 372ce492e8823af276f4a78963967b9bb23ef6a7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 1 Sep 2025 07:11:01 +0000 Subject: [PATCH] eclass/multilib: Sync with Gentoo It's from Gentoo commit 3496df638fca284c97927d42ed27a76763b60f36. Signed-off-by: Flatcar Buildbot --- .../third_party/portage-stable/eclass/multilib.eclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass b/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass index f19ad20af8..c28fee7aa1 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: multilib.eclass @@ -552,10 +552,10 @@ multilib_toolchain_setup() { export STRIP="$(tc-getSTRIP)" # Avoid 'strip', use '${CHOST}-strip' export CHOST=$(get_abi_CHOST $1) - export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig - export PKG_CONFIG_PATH=${EPREFIX}/usr/share/pkgconfig - export PKG_CONFIG_SYSTEM_INCLUDE_PATH=${EPREFIX}/usr/include - export PKG_CONFIG_SYSTEM_LIBRARY_PATH=${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir) + export PKG_CONFIG_LIBDIR=${ESYSROOT}/usr/$(get_libdir)/pkgconfig + export PKG_CONFIG_PATH=${ESYSROOT}/usr/share/pkgconfig + export PKG_CONFIG_SYSTEM_INCLUDE_PATH=${ESYSROOT}/usr/include + export PKG_CONFIG_SYSTEM_LIBRARY_PATH=${ESYSROOT}/$(get_libdir):${ESYSROOT}/usr/$(get_libdir) fi }