aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-18 08:31:53 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2014-07-22 00:01:56 +0200
commit09d11d7c3850a9cf3be5beffe1d99bed6fb1c834 (patch)
treed9a8f49ef86fc7380ca2a0b537bea244d44d15a9 /meta-oe
parentbe9f03c181f7fa9b06fee97310a052504335d2c9 (diff)
downloadmeta-openembedded-contrib-09d11d7c3850a9cf3be5beffe1d99bed6fb1c834.tar.gz
meta-openembedded-contrib-09d11d7c3850a9cf3be5beffe1d99bed6fb1c834.tar.bz2
meta-openembedded-contrib-09d11d7c3850a9cf3be5beffe1d99bed6fb1c834.zip
libotr: Fix B!=S build failures
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-support/pidgin/libotr/sepbuild.patch16
-rw-r--r--meta-oe/recipes-support/pidgin/libotr_4.0.0.bb1
2 files changed, 17 insertions, 0 deletions
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 0000000000..f66e52881c
--- /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 a312841343..dd9eeab7a9 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"