summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2013-07-31 18:59:46 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-08-01 15:17:26 (GMT)
commit5fb26d1bca4cffb207d10a452f1a4b590cc41543 (patch)
treeb61b528ecf17e355491c517e9815dac3c9a0966e
parent3e56504d9f5eec801154664f985b4c189340e99d (diff)
downloadbuildroot-5fb26d1bca4cffb207d10a452f1a4b590cc41543.tar.gz
buildroot-5fb26d1bca4cffb207d10a452f1a4b590cc41543.tar.bz2
libgpgme: handle argp-standalone
libgpgme has an internal implementation of argp parsing for when the libc lacks such an implementation (i.e. uClibc). However if it detects argp.h the internal implementation is disabled and for a uClibc-based toolchain that breaks the build. This happens when argp-standalone is installed since libgpgme never tries to link to libargp. Make it link against libargp, which also saves some target size. Fixes: http://autobuild.buildroot.net/results/33c/33c5776d2b3f7fa276a27f7602eb71c4d77c7b62/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/libgpgme/libgpgme.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk
index ee983df..9995d91 100644
--- a/package/libgpgme/libgpgme.mk
+++ b/package/libgpgme/libgpgme.mk
@@ -10,6 +10,7 @@ LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2
LIBGPGME_LICENSE = LGPLv2.1+
LIBGPGME_LICENSE_FILES = COPYING.LESSER
LIBGPGME_INSTALL_STAGING = YES
+LIBGPGME_DEPENDENCIES = libassuan libgpg-error
# libgpgme, needs to know the gpg binary path on the target.
LIBGPGME_CONF_OPT = --with-gpg=/usr/bin/gpg \
@@ -18,6 +19,11 @@ LIBGPGME_CONF_OPT = --with-gpg=/usr/bin/gpg \
--without-gpgsm \
--without-gpgconf \
--without-g13
-LIBGPGME_DEPENDENCIES = libassuan libgpg-error
+
+# Handle argp-standalone or it errors out during build
+ifeq ($(BR2_PACKAGE_ARGP_STANDALONE)$(BR2_TOOLCHAIN_USES_UCLIBC),yy)
+LIBGPGME_CONF_ENV += LIBS="-largp"
+LIBGPGME_DEPENDENCIES += argp-standalone
+endif
$(eval $(autotools-package))