mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-15 14:56:43 +01:00
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>
This commit is contained in:
parent
ed2cb1735a
commit
72f006a903
|
|
@ -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
|
||||
])
|
||||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user