[oe-commits] Richard Purdie : libotr: Fix B!=S build failures

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 4af8f7cb4f93c4e43f1ba2096f7022f6db586326
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=4af8f7cb4f93c4e43f1ba2096f7022f6db586326

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Fri Jul 18 08:31:53 2014 +0000

libotr: Fix B!=S build failures

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta-oe/recipes-support/pidgin/libotr/sepbuild.patch | 16 ++++++++++++++++
 meta-oe/recipes-support/pidgin/libotr_4.0.0.bb       |  1 +
 2 files changed, 17 insertions(+)

diff --git a/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch b/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch
new file mode 100644
index 0000000..f66e528
--- /dev/null
+++ b/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch
@@ -0,0 +1,16 @@
+Fix builds with ${B} != ${S}
+
+Upstream-Status: Pending
+
+RP 2014/7/17
+
+Index: libotr-4.0.0/toolkit/Makefile.am
+===================================================================
+--- libotr-4.0.0.orig/toolkit/Makefile.am	2014-07-16 18:09:59.777858022 +0000
++++ libotr-4.0.0/toolkit/Makefile.am	2014-07-17 06:28:51.359066155 +0000
+@@ -1,4 +1,4 @@
+-INCLUDES = -I../src @LIBGCRYPT_CFLAGS@
++INCLUDES = -I$(top_srcdir)/src @LIBGCRYPT_CFLAGS@
+ 
+ noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h
+ 
diff --git a/meta-oe/recipes-support/pidgin/libotr_4.0.0.bb b/meta-oe/recipes-support/pidgin/libotr_4.0.0.bb
index a312841..dd9eeab 100644
--- a/meta-oe/recipes-support/pidgin/libotr_4.0.0.bb
+++ b/meta-oe/recipes-support/pidgin/libotr_4.0.0.bb
@@ -6,6 +6,7 @@ DEPENDS = "libgcrypt libgpg-error"
 
 SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \
            file://fix_qa-issue_include.patch \
+           file://sepbuild.patch \
 "
 
 SRC_URI[md5sum] = "00979dca82d70383fcd1b01f3974363c"