[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Gilbert]

commit:     db1630476083e7a09767e9bd96ecdb7ac3f7496c
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Nov 23 23:00:00 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 17:45:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db163047

multilib.eclass: Include /$(get_libdir) in PKG_CONFIG_SYSTEM_LIBRARY_PATH.

Set also PKG_CONFIG_SYSTEM_INCLUDE_PATH for consistency.

Bug: https://bugs.gentoo.org/756238
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 eclass/multilib.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 9c7042fcd29..33ca9726131 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -498,6 +498,7 @@ multilib_toolchain_setup() {
                STRIP
                PKG_CONFIG_LIBDIR
                PKG_CONFIG_PATH
+               PKG_CONFIG_SYSTEM_INCLUDE_PATH
                PKG_CONFIG_SYSTEM_LIBRARY_PATH
        )
 
@@ -547,7 +548,8 @@ multilib_toolchain_setup() {
                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_LIBRARY_PATH=${EPREFIX}/usr/$(get_libdir)
+               export PKG_CONFIG_SYSTEM_INCLUDE_PATH=${EPREFIX}/usr/include
+               export 
PKG_CONFIG_SYSTEM_LIBRARY_PATH=${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)
        fi
 }