diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-03-20 15:57:51 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-03-21 08:25:11 -0700 |
| commit | 72f006a903068092ee64d4aa1bc7f30fce39c22a (patch) | |
| tree | c2559fc69fbd849d3e3073ab2157a2a81dd5cd62 /meta-oe/recipes-devtools | |
| parent | ed2cb1735ae1323bfea75bd625a3663b1ed0a2aa (diff) | |
| download | meta-openembedded-contrib-72f006a903068092ee64d4aa1bc7f30fce39c22a.tar.gz | |
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 <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools')
| -rw-r--r-- | meta-oe/recipes-devtools/geany/geany-plugins/0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch | 32 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb | 1 |
2 files changed, 33 insertions, 0 deletions
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 0000000000..cd417e0d7b --- /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 <raj.khem@gmail.com> +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 <raj.khem@gmail.com> +--- + 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 + ]) diff --git a/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb b/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb index b6857917f5..fa4cccca03 100644 --- a/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb +++ b/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb @@ -32,6 +32,7 @@ SRC_URI = " \ https://plugins.geany.org/${BPN}/${BP}.tar.bz2 \ file://0001-Use-pkg-config-to-find-gpgme.patch \ file://0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch \ + file://0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch \ " SRC_URI[sha256sum] = "1c578a7ebb390aa8882f195acd3d8da3ceb73925d291b28dec90cd3e5fd20586" |