commit:     f4191f199195beda8ef96939b68a00325e04a0f8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  7 05:13:03 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 00:26:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4191f19

media-gfx/freewrl: call pkg-config via toolchain-funcs.eclass helper

This ensures we call the correct pkg-config in e.g. cross.

Package-Manager: Portage-3.0.14-prefix, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/freewrl/freewrl-3.0.0-r1.ebuild | 6 +++---
 media-gfx/freewrl/freewrl-9999.ebuild     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild 
b/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
index b7a8547435d..83573845b92 100644
--- a/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
+++ b/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
+inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib 
toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
        inherit git-r3
@@ -85,8 +85,8 @@ src_configure() {
                        JAVASCRIPT_ENGINE_LIBS="-ljs"
                fi
                if has_version "dev-lang/spidermonkey:0[threadsafe]" ; then
-                       JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE 
$(pkg-config --cflags nspr)"
-                       JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) 
${JAVASCRIPT_ENGINE_LIBS}"
+                       JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE 
$($(tc-getPKG_CONFIG) --cflags nspr)"
+                       JAVASCRIPT_ENGINE_LIBS="$($(tc-getPKG_CONFIG) --libs 
nspr) ${JAVASCRIPT_ENGINE_LIBS}"
                fi
                export JAVASCRIPT_ENGINE_CFLAGS
                export JAVASCRIPT_ENGINE_LIBS

diff --git a/media-gfx/freewrl/freewrl-9999.ebuild 
b/media-gfx/freewrl/freewrl-9999.ebuild
index 0f77fc735ce..d9b0473a92b 100644
--- a/media-gfx/freewrl/freewrl-9999.ebuild
+++ b/media-gfx/freewrl/freewrl-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
+inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib 
toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
        inherit git-r3
@@ -86,8 +86,8 @@ src_configure() {
                        JAVASCRIPT_ENGINE_LIBS="-ljs"
                fi
                if has_version "dev-lang/spidermonkey:0[threadsafe]" ; then
-                       JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE 
$(pkg-config --cflags nspr)"
-                       JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) 
${JAVASCRIPT_ENGINE_LIBS}"
+                       JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE 
$($(tc-getPKG_CONFIG) --cflags nspr)"
+                       JAVASCRIPT_ENGINE_LIBS="$($(tc-getPKG_CONFIG) --libs 
nspr) ${JAVASCRIPT_ENGINE_LIBS}"
                fi
                export JAVASCRIPT_ENGINE_CFLAGS
                export JAVASCRIPT_ENGINE_LIBS

Reply via email to