aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-12-12 12:12:13 -0800
committerKhem Raj <raj.khem@gmail.com>2020-12-12 14:31:15 -0800
commit99bc44010402c2d8211805e78f6d4df751cf00e0 (patch)
treedffdae4baf239a8315f78363a46f2194761c7f22
parent936f2380bb5112721eec2db46eb35b5600ac28de (diff)
downloadmeta-openembedded-contrib-99bc44010402c2d8211805e78f6d4df751cf00e0.tar.gz
meta-openembedded-contrib-99bc44010402c2d8211805e78f6d4df751cf00e0.tar.bz2
meta-openembedded-contrib-99bc44010402c2d8211805e78f6d4df751cf00e0.zip
pidgin-sipe: Do not add native libdir to pkgconfig search path
This works fine until valgrind is installed on build host but its not selected as option to build in recipe, configure wrongly pokes at /usr/lib and sees valgrind there and enables it but only to fail in compile time where it does not find valgrind.h in recipe sysroot, since OE's build environment add right guardrails to pkgconfig, there is no need to add build staging area to pkgconfig search path which turns out to be wrong for cross builds anyway Fixes ../../../pidgin-sipe-1.25.0/src/core/sipe-cert-crypto-nss.c:34:10: fatal error: 'valgrind.h' file not found ^~~~~~~~~~~~ Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch36
-rw-r--r--meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch
new file mode 100644
index 0000000000..1dc7ca3f17
--- /dev/null
+++ b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch
@@ -0,0 +1,36 @@
+From fedef3c0b1772cee97d7288bee7d5d50805a5964 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 12 Dec 2020 08:56:04 -0800
+Subject: [PATCH] configure: Do not add native paths to pkgconfig search
+
+This does not work in cross environments, secondly in OE we already
+point pkkconfig into recipe sysroot where it will find all the
+dependencies therefore this setting is not needed
+
+Upstream-Status: Inappropriate [ OE-Specific ]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0df85b0..2481153 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -70,12 +70,6 @@ AC_CHECK_HEADERS([])
+ dnl checks for library functions
+ AC_CHECK_FUNCS([])
+
+-dnl tell pkgconfig to look in the same prefix where we're installing this to,
+-dnl as that is likely where libpurple will be found if it is not in the default
+-dnl pkgconfig path
+-PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${libdir}/pkgconfig"
+-export PKG_CONFIG_PATH
+-
+ dnl debug mode
+ AC_ARG_ENABLE(debug,
+ [AS_HELP_STRING([--enable-debug],
+--
+2.29.2
+
diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb
index 99fcf3c6d0..f6b4c7cee1 100644
--- a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb
+++ b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb
@@ -10,6 +10,7 @@ inherit autotools gettext pkgconfig
SRC_URI = "${SOURCEFORGE_MIRROR}/sipe/pidgin-sipe-${PV}.tar.xz \
file://0001-sipe-consider-64bit-time_t-when-printing.patch \
file://0001-Align-structs-casts-with-time_t-elements-to-8byte-bo.patch \
+ file://0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch \
"
SRC_URI[md5sum] = "0e742f021dc8c3f17435aea05c3e0314"