summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2015-02-13 06:59:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-15 21:58:28 +0000
commitcd34df3c4b50dc937eea1c837128963e7afb3645 (patch)
tree5c966bee9b0839aab317a40b0c5a97fb578be3f2 /meta
parent6cac3ad6fab8d20da77c5b8a66235396bc89d701 (diff)
downloadpoky-cd34df3c4b50dc937eea1c837128963e7afb3645.tar.gz
gpgme: fix configuration by setting proper parameters instead of patching
(From OE-Core rev: ea4c80098d9fc938e77991b4fcd09c09d0032efb) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/gpgme/gpgme-1.4.3/disable_gpgconf_check.patch39
-rw-r--r--meta/recipes-support/gpgme/gpgme_1.4.3.bb4
2 files changed, 1 insertions, 42 deletions
diff --git a/meta/recipes-support/gpgme/gpgme-1.4.3/disable_gpgconf_check.patch b/meta/recipes-support/gpgme/gpgme-1.4.3/disable_gpgconf_check.patch
deleted file mode 100644
index df0953069c..0000000000
--- a/meta/recipes-support/gpgme/gpgme-1.4.3/disable_gpgconf_check.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 1.2.0, gpgme will check if gpgconf & g13(from 1.3.0) exist, and cause
2configure failure if not founding them in cross-compile environment. We can
3add the gnupg-native to get them, but still have some issues:
4
51. need add new package: libksba, update libassuan(not in sato), and extend
6 native support in some other packages(libgcrypt, libgpg-error, pth...)
72. Even we have gnupg, the g13 only exist in development branch, so that we
8 still have the g13 check failure in configure.
9
10I have searched the compile log, and found gpgconf/g13 are not used. So use a
11simple method here, throw a warning mesg rather than an error here just like in
12non-cross-compile environment.
13
14Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
15
16Upstream-Status: Inappropriate [embedded specific]
17
18Index: 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 ***])
diff --git a/meta/recipes-support/gpgme/gpgme_1.4.3.bb b/meta/recipes-support/gpgme/gpgme_1.4.3.bb
index ca1e5f9344..98fd68b837 100644
--- a/meta/recipes-support/gpgme/gpgme_1.4.3.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.4.3.bb
@@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
10 file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" 10 file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d"
11 11
12SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \ 12SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \
13 file://disable_gpgconf_check.patch \
14 file://gpgme.pc" 13 file://gpgme.pc"
15 14
16SRC_URI[md5sum] = "334e524cffa8af4e2f43ae8afe585672" 15SRC_URI[md5sum] = "334e524cffa8af4e2f43ae8afe585672"
@@ -18,9 +17,8 @@ SRC_URI[sha256sum] = "2d1cc12411753752d9c5b9037e6fd3fd363517af720154768cc7b46b60
18 17
19DEPENDS = "libgpg-error libassuan" 18DEPENDS = "libgpg-error libassuan"
20 19
21EXTRA_OECONF = "--with-gpg=${bindir}/gpg --without-gpgsm"
22
23BINCONFIG = "${bindir}/gpgme-config" 20BINCONFIG = "${bindir}/gpgme-config"
21EXTRA_OECONF = "--with-gpg=${bindir}/gpg --without-gpgsm --with-gpgconf=no --with-g13=no"
24 22
25inherit autotools texinfo binconfig-disabled pkgconfig 23inherit autotools texinfo binconfig-disabled pkgconfig
26 24