diff options
| -rw-r--r-- | meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch | 36 | ||||
| -rw-r--r-- | meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb | 1 |
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 @@ | |||
| 1 | From fedef3c0b1772cee97d7288bee7d5d50805a5964 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 12 Dec 2020 08:56:04 -0800 | ||
| 4 | Subject: [PATCH] configure: Do not add native paths to pkgconfig search | ||
| 5 | |||
| 6 | This does not work in cross environments, secondly in OE we already | ||
| 7 | point pkkconfig into recipe sysroot where it will find all the | ||
| 8 | dependencies therefore this setting is not needed | ||
| 9 | |||
| 10 | Upstream-Status: Inappropriate [ OE-Specific ] | ||
| 11 | |||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | configure.ac | 6 ------ | ||
| 15 | 1 file changed, 6 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/configure.ac b/configure.ac | ||
| 18 | index 0df85b0..2481153 100644 | ||
| 19 | --- a/configure.ac | ||
| 20 | +++ b/configure.ac | ||
| 21 | @@ -70,12 +70,6 @@ AC_CHECK_HEADERS([]) | ||
| 22 | dnl checks for library functions | ||
| 23 | AC_CHECK_FUNCS([]) | ||
| 24 | |||
| 25 | -dnl tell pkgconfig to look in the same prefix where we're installing this to, | ||
| 26 | -dnl as that is likely where libpurple will be found if it is not in the default | ||
| 27 | -dnl pkgconfig path | ||
| 28 | -PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${libdir}/pkgconfig" | ||
| 29 | -export PKG_CONFIG_PATH | ||
| 30 | - | ||
| 31 | dnl debug mode | ||
| 32 | AC_ARG_ENABLE(debug, | ||
| 33 | [AS_HELP_STRING([--enable-debug], | ||
| 34 | -- | ||
| 35 | 2.29.2 | ||
| 36 | |||
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 | |||
| 10 | SRC_URI = "${SOURCEFORGE_MIRROR}/sipe/pidgin-sipe-${PV}.tar.xz \ | 10 | SRC_URI = "${SOURCEFORGE_MIRROR}/sipe/pidgin-sipe-${PV}.tar.xz \ |
| 11 | file://0001-sipe-consider-64bit-time_t-when-printing.patch \ | 11 | file://0001-sipe-consider-64bit-time_t-when-printing.patch \ |
| 12 | file://0001-Align-structs-casts-with-time_t-elements-to-8byte-bo.patch \ | 12 | file://0001-Align-structs-casts-with-time_t-elements-to-8byte-bo.patch \ |
| 13 | file://0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch \ | ||
| 13 | " | 14 | " |
| 14 | 15 | ||
| 15 | SRC_URI[md5sum] = "0e742f021dc8c3f17435aea05c3e0314" | 16 | SRC_URI[md5sum] = "0e742f021dc8c3f17435aea05c3e0314" |
