diff options
| author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
| commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
| tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-oe/recipes-support/pidgin/libotr | |
| parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
| download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz | |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/pidgin/libotr')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch | 18 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch | 16 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch new file mode 100644 index 0000000000..ecdbffb513 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch @@ -0,0 +1,18 @@ +libotr: Fix QA-issue where also files from buildhost would be included + +Warning was: +cc1: warning: include location "/usr/include" is unsafe for +cross-compilation [-Wpoison-system-directories] + +Upstream-Status: Pending + +Signed-off-by: Jakob Drexel <jake42@rommel.stw.uni-erlangen.de> + +--- a/toolkit/Makefile.am 2012-05-03 15:52:22.000000000 +0200 ++++ b/toolkit/Makefile.am 2014-01-13 12:12:26.030369357 +0100 +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS = -I$(includedir) -I../src @LIBGCRYPT_CFLAGS@ ++AM_CPPFLAGS = -I../src @LIBGCRYPT_CFLAGS@ + + noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h + diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch new file mode 100644 index 0000000000..dda17a9577 --- /dev/null +++ b/meta-openembedded/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 @@ +-AM_CPPFLAGS = -I../src @LIBGCRYPT_CFLAGS@ ++AM_CPPFLAGS = -I$(top_srcdir)/src @LIBGCRYPT_CFLAGS@ + + noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h + |