Skip to contentSkip to conversation

libgpgme: handle argp-standalone

PATCH New Gustavo Zacarias 2 participants 2 messages Jul 31, 2013 – Aug 1, 2013

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH v2 1/1 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 <[email protected]>
---
 package/libgpgme/libgpgme.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/libgpgme/libgpgme.mk +7 -1
index ee983df..9995d91 100644
@@ -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))

--
1.8.1.5

Applied
#1 lore raw

PATCH v2 1/1 libgpgme: handle argp-standalone

Dear Gustavo Zacarias,

Quoted 7 lines · Gustavo Zacarias

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.

Quoted 7 lines

Make it link against libargp, which also saves some target size. Fixes:
http://autobuild.buildroot.net/results/33c/33c5776d2b3f7fa276a27f7602eb71c4d77c7b62/

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/libgpgme/libgpgme.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Applied, thanks.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com