diff mbox

p11-kit: fix argp_standalone build error

Message ID 1370456263-17708-1-git-send-email-gustavo@zacarias.com.ar
State Accepted
Commit a7e8b6237458922f0a75103fb5c28e6fe713db7c
Headers show

Commit Message

Gustavo Zacarias June 5, 2013, 6:17 p.m. UTC
When BR2_PACKAGE_ARGP_STANDALONE is enabled and built before p11-kit the
configure script detects it and a conflict arises because libc already
includes and defines program_invocation_short_name.
Avoid this by forcing the detection to true otherwise the configure
script tries to use argp-standalone and it clashes with libc. Fixes:
http://autobuild.buildroot.net/results/a39/a39fe81a356b922a891d4225a56ce2427ab5bca7/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/p11-kit/p11-kit.mk | 2 ++
 1 file changed, 2 insertions(+)

Comments

Peter Korsgaard June 5, 2013, 10 p.m. UTC | #1
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> When BR2_PACKAGE_ARGP_STANDALONE is enabled and built before p11-kit the
 Gustavo> configure script detects it and a conflict arises because libc already
 Gustavo> includes and defines program_invocation_short_name.
 Gustavo> Avoid this by forcing the detection to true otherwise the configure
 Gustavo> script tries to use argp-standalone and it clashes with libc. Fixes:
 Gustavo> http://autobuild.buildroot.net/results/a39/a39fe81a356b922a891d4225a56ce2427ab5bca7/

Hmm, still doesn't seem to work:

http://autobuild.buildroot.net/results/cc8/cc861f5a034a0922a90fb6f22835a1fe8205d497/build-end.log
diff mbox

Patch

diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk
index 2ddb27c..89774dc 100644
--- a/package/p11-kit/p11-kit.mk
+++ b/package/p11-kit/p11-kit.mk
@@ -9,6 +9,8 @@  P11_KIT_SITE = http://p11-glue.freedesktop.org/releases
 P11_KIT_DEPENDENCIES = host-pkgconf libtasn1
 P11_KIT_INSTALL_STAGING = YES
 P11_KIT_CONF_OPT = --disable-static
+P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \
+	ac_cv_have_decl___progname=yes
 P11_KIT_LICENSE = BSD-3c
 P11_KIT_LICENSE_FILES = COPYING