summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch')
-rw-r--r--meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch51
1 files changed, 29 insertions, 22 deletions
diff --git a/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch b/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch
index cfc681cd8..72bf4ed41 100644
--- a/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch
+++ b/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch
@@ -1,27 +1,34 @@
1From 428836ba7f9048970626ef0d6b805107f7c52d33 Mon Sep 17 00:00:00 2001 1Use pkg-config instead of ${PYTHON}-config to find python
2From: Herrie <github.com@herrie.org>
3Date: Thu, 5 May 2016 13:33:29 +0200
4Subject: [PATCH] Updated python patch
5 2
6--- 3diff -uNr pidgin-2.10.12.orig/configure.ac pidgin-2.10.12/configure.ac
7 configure.ac | 6 +++--- 4--- pidgin-2.10.12.orig/configure.ac 2016-01-01 00:19:40.000000000 +0100
8 1 file changed, 3 insertions(+), 3 deletions(-) 5+++ pidgin-2.10.12/configure.ac 2016-05-05 16:55:13.258945925 +0200
9 6@@ -1585,20 +1585,15 @@
10diff --git a/configure.ac b/configure.ac 7 dnl Check for Python headers (currently useful only for libgnt)
11index 94ea8cf..2285adb 100644 8 dnl (Thanks to XChat)
12--- a/configure.ac
13+++ b/configure.ac
14@@ -1587,9 +1587,9 @@ dnl (Thanks to XChat)
15 if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then 9 if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then
16 AC_MSG_CHECKING(for Python compile flags) 10- AC_MSG_CHECKING(for Python compile flags)
17 if test -f ${PYTHON}-config; then 11- if test -f ${PYTHON}-config; then
18- PY_CFLAGS=`${PYTHON}-config --includes` 12- PY_CFLAGS=`${PYTHON}-config --includes`
19- PY_LIBS=`${PYTHON}-config --libs` 13- PY_LIBS=`${PYTHON}-config --libs`
20- AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.]) 14- AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.])
21+ m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$]) 15- AC_MSG_RESULT(ok)
22+ PY_LIBS="-L$PKG_CONFIG_SYSROOT_DIR/usr/lib/python$PY_VERSION/config -lpython$PY_VERSION" 16- else
23+ PY_CFLAGS="-I$PKG_CONFIG_SYSROOT_DIR/usr/include/python$PY_VERSION" AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.]) 17- AC_MSG_RESULT([Cannot find ${PYTHON}-config])
24 AC_MSG_RESULT(ok) 18- PY_CFLAGS=""
25 else 19- PY_LIBS=""
26 AC_MSG_RESULT([Cannot find ${PYTHON}-config]) 20- fi
27 21+ AC_MSG_CHECKING(for Python compile flags)
22+ PKG_CHECK_MODULES(PY, python, [
23+ AC_SUBST(PY_CFLAGS)
24+ AC_SUBST(PY_LIBS)
25+ ], [
26+ AC_MSG_RESULT(no)
27+ AC_MSG_ERROR([Can't find python])
28+ ])
29 fi
30-AC_SUBST(PY_CFLAGS)
31-AC_SUBST(PY_LIBS)
32
33 dnl #######################################################################
34 dnl # Check for Mono support