sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Andreas Müller 2015-02-13 06:59:50 +01:00 committed by Richard Purdie
parent 6cac3ad6fa
commit cd34df3c4b
2 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
meta/recipes-support/gpgme/gpgme-1.4.3/disable_gpgconf_check.patch
View File

@ -1,39 +0,0 @@
From 1.2.0, gpgme will check if gpgconf & g13(from 1.3.0) exist, and cause
configure failure if not founding them in cross-compile environment. We can
add the gnupg-native to get them, but still have some issues:
1. need add new package: libksba, update libassuan(not in sato), and extend
native support in some other packages(libgcrypt, libgpg-error, pth...)
2. Even we have gnupg, the g13 only exist in development branch, so that we
still have the g13 check failure in configure.
I have searched the compile log, and found gpgconf/g13 are not used. So use a
simple method here, throw a warning mesg rather than an error here just like in
non-cross-compile environment.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Upstream-Status: Inappropriate [embedded specific]
Index: gpgme-1.3.0/configure.ac
===================================================================
--- gpgme-1.3.0.orig/configure.ac 2010-07-21 09:38:09.000000000 +0800
+++ gpgme-1.3.0/configure.ac 2010-07-21 09:39:19.000000000 +0800
@@ -574,7 +574,7 @@
*** Could not find gpgconf, install gpgconf or use --with-gpgconf=PATH to enable it
***])
else
- AC_MSG_ERROR([
+ AC_MSG_WARN([
***
*** Can not determine path to gpgconf when cross-compiling, use --with-gpgconf=PATH
***])
@@ -670,7 +670,7 @@
*** Could not find g13, install g13 or use --with-g13=PATH to enable it
***])
else
- AC_MSG_ERROR([
+ AC_MSG_WARN([
***
*** Can not determine path to g13 when cross-compiling, use --with-g13=PATH
***])

4
meta/recipes-support/gpgme/gpgme_1.4.3.bb
View File

@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d"
SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \
file://disable_gpgconf_check.patch \
file://gpgme.pc"
SRC_URI[md5sum] = "334e524cffa8af4e2f43ae8afe585672"
@ -18,9 +17,8 @@ SRC_URI[sha256sum] = "2d1cc12411753752d9c5b9037e6fd3fd363517af720154768cc7b46b60
DEPENDS = "libgpg-error libassuan"
EXTRA_OECONF = "--with-gpg=${bindir}/gpg --without-gpgsm"
BINCONFIG = "${bindir}/gpgme-config"
EXTRA_OECONF = "--with-gpg=${bindir}/gpg --without-gpgsm --with-gpgconf=no --with-g13=no"
inherit autotools texinfo binconfig-disabled pkgconfig