diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-18 08:31:53 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-22 00:01:56 +0200 |
commit | 09d11d7c3850a9cf3be5beffe1d99bed6fb1c834 (patch) | |
tree | d9a8f49ef86fc7380ca2a0b537bea244d44d15a9 | |
parent | be9f03c181f7fa9b06fee97310a052504335d2c9 (diff) | |
download | meta-openembedded-09d11d7c3850a9cf3be5beffe1d99bed6fb1c834.tar.gz |
libotr: Fix B!=S build failures
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta-oe/recipes-support/pidgin/libotr/sepbuild.patch | 16 | ||||
-rw-r--r-- | meta-oe/recipes-support/pidgin/libotr_4.0.0.bb | 1 |
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 000000000..f66e52881 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch | |||
@@ -0,0 +1,16 @@ | |||
1 | Fix builds with ${B} != ${S} | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | RP 2014/7/17 | ||
6 | |||
7 | Index: libotr-4.0.0/toolkit/Makefile.am | ||
8 | =================================================================== | ||
9 | --- libotr-4.0.0.orig/toolkit/Makefile.am 2014-07-16 18:09:59.777858022 +0000 | ||
10 | +++ libotr-4.0.0/toolkit/Makefile.am 2014-07-17 06:28:51.359066155 +0000 | ||
11 | @@ -1,4 +1,4 @@ | ||
12 | -INCLUDES = -I../src @LIBGCRYPT_CFLAGS@ | ||
13 | +INCLUDES = -I$(top_srcdir)/src @LIBGCRYPT_CFLAGS@ | ||
14 | |||
15 | noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h | ||
16 | |||
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 a31284134..dd9eeab7a 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" | |||
6 | 6 | ||
7 | SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \ | 7 | SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \ |
8 | file://fix_qa-issue_include.patch \ | 8 | file://fix_qa-issue_include.patch \ |
9 | file://sepbuild.patch \ | ||
9 | " | 10 | " |
10 | 11 | ||
11 | SRC_URI[md5sum] = "00979dca82d70383fcd1b01f3974363c" | 12 | SRC_URI[md5sum] = "00979dca82d70383fcd1b01f3974363c" |