From 72f006a903068092ee64d4aa1bc7f30fce39c22a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 20 Mar 2022 15:57:51 -0700 Subject: geany-plugins: Do not overwrite OE's pkg-config env geany.m4 tries to push additional pkg-config paths to respect --with-geany-libdir if it sets to different paths, however we do not use --with-geany-libdir with in OE build so this is more of a problem for OE than solution. Signed-off-by: Khem Raj --- ...ny.m4-Do-not-tinker-with-pkg-config-paths.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 meta-oe/recipes-devtools/geany/geany-plugins/0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch (limited to 'meta-oe/recipes-devtools/geany/geany-plugins') diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch new file mode 100644 index 000000000..cd417e0d7 --- /dev/null +++ b/meta-oe/recipes-devtools/geany/geany-plugins/0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch @@ -0,0 +1,32 @@ +From b2187b45f61ce362a9d58d9081d66daddb4e577f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 20 Mar 2022 15:54:14 -0700 +Subject: [PATCH] geany.m4: Do not tinker with pkg-config paths + +OE sets up these paths correctly w.r.t. target sysroot + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj +--- + build/geany.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/build/geany.m4 ++++ b/build/geany.m4 +@@ -32,7 +32,8 @@ AC_DEFUN([GP_CHECK_GEANY], + [ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + +- GP_GEANY_PKG_CONFIG_PATH_PUSH ++ dnl GP_GEANY_PKG_CONFIG_PATH_PUSH ++ AC_REQUIRE([_GP_GEANY_LIBDIR]) + + PKG_CHECK_MODULES([GEANY], [geany >= $1]) + geanypluginsdir=$geany_libdir/geany +@@ -40,5 +41,5 @@ AC_DEFUN([GP_CHECK_GEANY], + AC_SUBST([geanypluginsdir]) + AC_SUBST([GEANY_VERSION]) + +- GP_GEANY_PKG_CONFIG_PATH_POP ++ dnl GP_GEANY_PKG_CONFIG_PATH_POP + ]) -- cgit v1.2.3-54-g00ecf