[PATCH 67/73] gpgme: Define __error_t_defined on musl

Khem Raj
2016-01-17T11:37:59Z

Configure looks for error_t in errno.h and musl does not define error_t
if its not defined then configure emits a definition to be used, now we
also use standalone argp implementation from glibc on musl based systems
which defines this in argp.h as well so now we have it defined twice
and errors like

|
/a/builder/mnt/build-oe/tmp-musl/sysroots/raspberrypi2/usr/include/argp.h:40:13:
error: cannot combine with previous 'int' declaration specifier
| typedef int error_t;
| ^
| ../config.h:257:17: note: expanded from macro 'error_t'
| #define error_t int
| ^
| 1 error generated.

are seen. argp.h definition is conditional on __error_t_defined which is
true here so lets define it on musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-support/gpgme/gpgme_1.5.4.bb | 1 +
1 file changed, 1 insertion(+)

diff --git a/meta/recipes-support/gpgme/gpgme_1.5.4.bb b/meta/recipes-support/gpgme/gpgme_1.5.4.bb
index 1598377..f2211f1 100644
--- a/meta/recipes-support/gpgme/gpgme_1.5.4.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.5.4.bb
@@ -27,6 +27,7 @@ PACKAGES =+ "${PN}-pthread"
FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*"
FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/*"

+CFLAGS_append_libc-musl = " -D__error_t_defined "
do_configure_prepend () {
# Else these could be used in preference to those in aclocal-copy
rm -f ${S}/m4/gpg-error.m4
--
2.7.0