public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-dev] [PATCH] multilib.eclass: Include /$(get_libdir) in PKG_CONFIG_SYSTEM_LIBRARY_PATH.
@ 2020-11-24  2:55 Mike Gilbert
  2020-11-24  7:50 ` Sergei Trofimovich
  0 siblings, 1 reply; 2+ messages in thread
From: Mike Gilbert @ 2020-11-24  2:55 UTC (permalink / raw
  To: gentoo-dev; +Cc: Arfrever Frehtes Taifersar Arahesis

From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>

Set also PKG_CONFIG_SYSTEM_INCLUDE_PATH for consistency.

Bug: https://bugs.gentoo.org/756238
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.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
 }
 
-- 
2.29.2



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [gentoo-dev] [PATCH] multilib.eclass: Include /$(get_libdir) in PKG_CONFIG_SYSTEM_LIBRARY_PATH.
  2020-11-24  2:55 [gentoo-dev] [PATCH] multilib.eclass: Include /$(get_libdir) in PKG_CONFIG_SYSTEM_LIBRARY_PATH Mike Gilbert
@ 2020-11-24  7:50 ` Sergei Trofimovich
  0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich @ 2020-11-24  7:50 UTC (permalink / raw
  To: Mike Gilbert; +Cc: gentoo-dev, Arfrever Frehtes Taifersar Arahesis

On Mon, 23 Nov 2020 21:55:35 -0500
Mike Gilbert <floppym@gentoo.org> wrote:

> From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
> 
> Set also PKG_CONFIG_SYSTEM_INCLUDE_PATH for consistency.
> 
> Bug: https://bugs.gentoo.org/756238
> Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.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
>  }

The patch looks good. Feel free to push.

-- 

  Sergei


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-11-24  7:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-24  2:55 [gentoo-dev] [PATCH] multilib.eclass: Include /$(get_libdir) in PKG_CONFIG_SYSTEM_LIBRARY_PATH Mike Gilbert
2020-11-24  7:50 ` Sergei Trofimovich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox