[gentoo-commits] repo/gentoo:master commit in: sys-devel/smatch/

[Mike Frysinger]

commit:     41189fa2e1db01515ef08662a76c3a58a75bc948
Author:     Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Fri May 22 07:09:49 2020 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri May 22 07:32:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41189fa2

sys-devel/smatch: avoid hardcoded pkg-config invocation

It's not a big deal here as we disable most deps, but it avoids
"command not found" errors when cross-compiling, and confusing
checkers looking for bad pkg-config invocation.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 sys-devel/smatch/smatch-1.60.ebuild | 3 +++
 sys-devel/smatch/smatch-9999.ebuild | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/sys-devel/smatch/smatch-1.60.ebuild 
b/sys-devel/smatch/smatch-1.60.ebuild
index e8505ae64d2..9423f1d108f 100644
--- a/sys-devel/smatch/smatch-1.60.ebuild
+++ b/sys-devel/smatch/smatch-1.60.ebuild
@@ -24,6 +24,7 @@ IUSE=""
 
 RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/${P}-7a4fdad
 
@@ -32,6 +33,7 @@ src_prepare() {
 
        sed -i \
                -e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' 
\
+               -e 's:pkg-config:$(PKG_CONFIG):' \
                Makefile || die
 }
 
@@ -43,6 +45,7 @@ _emake() {
                AR="$(tc-getAR)" \
                CC="$(tc-getCC)" \
                LD='$(CC)' \
+               PKG_CONFIG="$(tc-getPKG_CONFIG)" \
                HAVE_GTK2=no \
                HAVE_LLVM=no \
                HAVE_LIBXML=no \

diff --git a/sys-devel/smatch/smatch-9999.ebuild 
b/sys-devel/smatch/smatch-9999.ebuild
index 4e3cca48e99..8ba49a55ed4 100644
--- a/sys-devel/smatch/smatch-9999.ebuild
+++ b/sys-devel/smatch/smatch-9999.ebuild
@@ -23,12 +23,14 @@ IUSE=""
 
 RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
        default
 
        sed -i \
                -e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' 
\
+               -e 's:pkg-config:$(PKG_CONFIG):' \
                Makefile || die
 }
 
@@ -40,6 +42,7 @@ _emake() {
                AR="$(tc-getAR)" \
                CC="$(tc-getCC)" \
                LD='$(CC)' \
+               PKG_CONFIG="$(tc-getPKG_CONFIG)" \
                HAVE_GTK2=no \
                HAVE_LLVM=no \
                HAVE_LIBXML=no \