| 1 |
commit: 41189fa2e1db01515ef08662a76c3a58a75bc948 |
| 2 |
Author: Mike Frysinger <vapier <AT> chromium <DOT> org> |
| 3 |
AuthorDate: Fri May 22 07:09:49 2020 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 22 07:32:49 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41189fa2 |
| 7 |
|
| 8 |
sys-devel/smatch: avoid hardcoded pkg-config invocation |
| 9 |
|
| 10 |
It's not a big deal here as we disable most deps, but it avoids |
| 11 |
"command not found" errors when cross-compiling, and confusing |
| 12 |
checkers looking for bad pkg-config invocation. |
| 13 |
|
| 14 |
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org> |
| 15 |
|
| 16 |
sys-devel/smatch/smatch-1.60.ebuild | 3 +++ |
| 17 |
sys-devel/smatch/smatch-9999.ebuild | 3 +++ |
| 18 |
2 files changed, 6 insertions(+) |
| 19 |
|
| 20 |
diff --git a/sys-devel/smatch/smatch-1.60.ebuild b/sys-devel/smatch/smatch-1.60.ebuild |
| 21 |
index e8505ae64d2..9423f1d108f 100644 |
| 22 |
--- a/sys-devel/smatch/smatch-1.60.ebuild |
| 23 |
+++ b/sys-devel/smatch/smatch-1.60.ebuild |
| 24 |
@@ -24,6 +24,7 @@ IUSE="" |
| 25 |
|
| 26 |
RDEPEND="dev-db/sqlite" |
| 27 |
DEPEND="${RDEPEND}" |
| 28 |
+BDEPEND="virtual/pkgconfig" |
| 29 |
|
| 30 |
S=${WORKDIR}/${P}-7a4fdad |
| 31 |
|
| 32 |
@@ -32,6 +33,7 @@ src_prepare() { |
| 33 |
|
| 34 |
sed -i \ |
| 35 |
-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \ |
| 36 |
+ -e 's:pkg-config:$(PKG_CONFIG):' \ |
| 37 |
Makefile || die |
| 38 |
} |
| 39 |
|
| 40 |
@@ -43,6 +45,7 @@ _emake() { |
| 41 |
AR="$(tc-getAR)" \ |
| 42 |
CC="$(tc-getCC)" \ |
| 43 |
LD='$(CC)' \ |
| 44 |
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \ |
| 45 |
HAVE_GTK2=no \ |
| 46 |
HAVE_LLVM=no \ |
| 47 |
HAVE_LIBXML=no \ |
| 48 |
|
| 49 |
diff --git a/sys-devel/smatch/smatch-9999.ebuild b/sys-devel/smatch/smatch-9999.ebuild |
| 50 |
index 4e3cca48e99..8ba49a55ed4 100644 |
| 51 |
--- a/sys-devel/smatch/smatch-9999.ebuild |
| 52 |
+++ b/sys-devel/smatch/smatch-9999.ebuild |
| 53 |
@@ -23,12 +23,14 @@ IUSE="" |
| 54 |
|
| 55 |
RDEPEND="dev-db/sqlite" |
| 56 |
DEPEND="${RDEPEND}" |
| 57 |
+BDEPEND="virtual/pkgconfig" |
| 58 |
|
| 59 |
src_prepare() { |
| 60 |
default |
| 61 |
|
| 62 |
sed -i \ |
| 63 |
-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \ |
| 64 |
+ -e 's:pkg-config:$(PKG_CONFIG):' \ |
| 65 |
Makefile || die |
| 66 |
} |
| 67 |
|
| 68 |
@@ -40,6 +42,7 @@ _emake() { |
| 69 |
AR="$(tc-getAR)" \ |
| 70 |
CC="$(tc-getCC)" \ |
| 71 |
LD='$(CC)' \ |
| 72 |
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \ |
| 73 |
HAVE_GTK2=no \ |
| 74 |
HAVE_LLVM=no \ |
| 75 |
HAVE_LIBXML=no \ |
Archives