From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F14141382C5 for ; Fri, 22 May 2020 07:33:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8275E099E; Fri, 22 May 2020 07:33:12 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B23F9E099E for ; Fri, 22 May 2020 07:33:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CA30E34F0B7 for ; Fri, 22 May 2020 07:33:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 52D87254 for ; Fri, 22 May 2020 07:33:09 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1590132769.41189fa2e1db01515ef08662a76c3a58a75bc948.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/smatch/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/smatch/smatch-1.60.ebuild sys-devel/smatch/smatch-9999.ebuild X-VCS-Directories: sys-devel/smatch/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 41189fa2e1db01515ef08662a76c3a58a75bc948 X-VCS-Branch: master Date: Fri, 22 May 2020 07:33:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6f186cdf-2af4-419e-baed-b14772c76bfb X-Archives-Hash: 7f2611a1f5824be5af3574dbfdee57b6 commit: 41189fa2e1db01515ef08662a76c3a58a75bc948 Author: Mike Frysinger chromium org> AuthorDate: Fri May 22 07:09:49 2020 +0000 Commit: Mike Frysinger gentoo 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 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 \