| Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 1 | From b2187b45f61ce362a9d58d9081d66daddb4e577f Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 20 Mar 2022 15:54:14 -0700 |
| 4 | Subject: [PATCH] geany.m4: Do not tinker with pkg-config paths |
| 5 | |
| 6 | OE sets up these paths correctly w.r.t. target sysroot |
| 7 | |
| 8 | Upstream-Status: Inappropriate [OE-Specific] |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | --- |
| 11 | build/geany.m4 | 4 ++-- |
| 12 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 13 | |
| 14 | --- a/build/geany.m4 |
| 15 | +++ b/build/geany.m4 |
| 16 | @@ -32,7 +32,8 @@ AC_DEFUN([GP_CHECK_GEANY], |
| 17 | [ |
| 18 | AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
| 19 | |
| 20 | - GP_GEANY_PKG_CONFIG_PATH_PUSH |
| 21 | + dnl GP_GEANY_PKG_CONFIG_PATH_PUSH |
| 22 | + AC_REQUIRE([_GP_GEANY_LIBDIR]) |
| 23 | |
| 24 | PKG_CHECK_MODULES([GEANY], [geany >= $1]) |
| 25 | geanypluginsdir=$geany_libdir/geany |
| 26 | @@ -40,5 +41,5 @@ AC_DEFUN([GP_CHECK_GEANY], |
| 27 | AC_SUBST([geanypluginsdir]) |
| 28 | AC_SUBST([GEANY_VERSION]) |
| 29 | |
| 30 | - GP_GEANY_PKG_CONFIG_PATH_POP |
| 31 | + dnl GP_GEANY_PKG_CONFIG_PATH_POP |
| 32 | ]) |