diff options
author | Valentin Popa <valentin.popa@intel.com> | 2012-06-22 15:27:53 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-25 16:35:52 +0100 |
commit | aecbfbc0abd584aa1a08cd655eae6e1f99b2a60c (patch) | |
tree | c5e3527ef30a1a5e9ef570e321858716c9a1078b /meta/recipes-support/gpgme/gpgme-1.3.2 | |
parent | 0abfb690a847df660726103157d7dc50a57286ec (diff) | |
download | poky-aecbfbc0abd584aa1a08cd655eae6e1f99b2a60c.tar.gz |
gpgme: updated to 1.3.2
Licence update: the same licence and new copyright years added
(From OE-Core rev: 0328d64cdf1daf2deee0ddc2a3aa3bbc8b812096)
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gpgme/gpgme-1.3.2')
-rw-r--r-- | meta/recipes-support/gpgme/gpgme-1.3.2/disable_gpgconf_check.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-support/gpgme/gpgme-1.3.2/disable_gpgconf_check.patch b/meta/recipes-support/gpgme/gpgme-1.3.2/disable_gpgconf_check.patch new file mode 100644 index 0000000000..df0953069c --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme-1.3.2/disable_gpgconf_check.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 1.2.0, gpgme will check if gpgconf & g13(from 1.3.0) exist, and cause | ||
2 | configure failure if not founding them in cross-compile environment. We can | ||
3 | add the gnupg-native to get them, but still have some issues: | ||
4 | |||
5 | 1. need add new package: libksba, update libassuan(not in sato), and extend | ||
6 | native support in some other packages(libgcrypt, libgpg-error, pth...) | ||
7 | 2. Even we have gnupg, the g13 only exist in development branch, so that we | ||
8 | still have the g13 check failure in configure. | ||
9 | |||
10 | I have searched the compile log, and found gpgconf/g13 are not used. So use a | ||
11 | simple method here, throw a warning mesg rather than an error here just like in | ||
12 | non-cross-compile environment. | ||
13 | |||
14 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
15 | |||
16 | Upstream-Status: Inappropriate [embedded specific] | ||
17 | |||
18 | Index: gpgme-1.3.0/configure.ac | ||
19 | =================================================================== | ||
20 | --- gpgme-1.3.0.orig/configure.ac 2010-07-21 09:38:09.000000000 +0800 | ||
21 | +++ gpgme-1.3.0/configure.ac 2010-07-21 09:39:19.000000000 +0800 | ||
22 | @@ -574,7 +574,7 @@ | ||
23 | *** Could not find gpgconf, install gpgconf or use --with-gpgconf=PATH to enable it | ||
24 | ***]) | ||
25 | else | ||
26 | - AC_MSG_ERROR([ | ||
27 | + AC_MSG_WARN([ | ||
28 | *** | ||
29 | *** Can not determine path to gpgconf when cross-compiling, use --with-gpgconf=PATH | ||
30 | ***]) | ||
31 | @@ -670,7 +670,7 @@ | ||
32 | *** Could not find g13, install g13 or use --with-g13=PATH to enable it | ||
33 | ***]) | ||
34 | else | ||
35 | - AC_MSG_ERROR([ | ||
36 | + AC_MSG_WARN([ | ||
37 | *** | ||
38 | *** Can not determine path to g13 when cross-compiling, use --with-g13=PATH | ||
39 | ***]) | ||