Patchwork [PATCHv2] gnutls: fix link-time build failures

login
register
mail settings
Submitter Gustavo Zacarias
Date Oct. 24, 2012, 10:20 p.m.
Message ID <1351117215-4614-1-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/194007/
State Accepted
Commit 092457dd3bc598f0920bddf79a62a39b2f13c4cd
Headers show

Comments

Gustavo Zacarias - Oct. 24, 2012, 10:20 p.m.
Fixes
http://autobuild.buildroot.net/results/23da17446266bdd49ea0da0c1892d66d3ac6607f/build-end.log
And may the <BEEP> rest in peace at last...

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/gnutls/gnutls.mk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
Thomas Petazzoni - Oct. 24, 2012, 10:43 p.m.
On Wed, 24 Oct 2012 19:20:15 -0300, Gustavo Zacarias wrote:
> Fixes
> http://autobuild.buildroot.net/results/23da17446266bdd49ea0da0c1892d66d3ac6607f/build-end.log
> And may the <BEEP> rest in peace at last...
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/gnutls/gnutls.mk |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Peter Korsgaard - Oct. 27, 2012, 9:20 p.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Fixes
 Gustavo> http://autobuild.buildroot.net/results/23da17446266bdd49ea0da0c1892d66d3ac6607f/build-end.log
 Gustavo> And may the <BEEP> rest in peace at last...

 Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 Gustavo> ---
 Gustavo>  package/gnutls/gnutls.mk |    3 ++-
 Gustavo>  1 files changed, 2 insertions(+), 1 deletions(-)

 Gustavo> diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
 Gustavo> index e889821..1ef6e3f 100644
 Gustavo> --- a/package/gnutls/gnutls.mk
 Gustavo> +++ b/package/gnutls/gnutls.mk
 Gustavo> @@ -10,8 +10,9 @@ GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
 Gustavo>  GNUTLS_LICENSE = GPLv3+ LGPLv2.1+
 Gustavo>  GNUTLS_LICENSE_FILES = COPYING lib/COPYING
 Gustavo>  GNUTLS_DEPENDENCIES = host-pkg-config libgcrypt $(if $(BR2_PACKAGE_ZLIB),zlib)
 Gustavo> +GNUTLS_CONF_ENV = acl_cv_rpath=no
 Gustavo>  GNUTLS_CONF_OPT = --with-libgcrypt --without-libgcrypt-prefix \
 Gustavo> -		--without-p11-kit
 Gustavo> +		--without-p11-kit --disable-rpath

It's a bit odd that you need both the variable and the configure
options, but OK - You presumably do.

Committed, thanks.
Gustavo Zacarias - Oct. 27, 2012, 10:52 p.m.
On 10/27/12 18:20, Peter Korsgaard wrote:

> It's a bit odd that you need both the variable and the configure
> options, but OK - You presumably do.
> 
> Committed, thanks.

--disable-rpath surely isn't enough, we've tested it with Thomas.
Looking at the complete source they're each referenced in different
inclusive and exclusive parts so i'd rather stay on the safe side with both.
I didn't test with just the configure env variable but looking at
configure they're both doing their separate assignments and i think we
don't want this to rear it's ugly head again :)
Regards.

Patch

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index e889821..1ef6e3f 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -10,8 +10,9 @@  GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
 GNUTLS_LICENSE = GPLv3+ LGPLv2.1+
 GNUTLS_LICENSE_FILES = COPYING lib/COPYING
 GNUTLS_DEPENDENCIES = host-pkg-config libgcrypt $(if $(BR2_PACKAGE_ZLIB),zlib)
+GNUTLS_CONF_ENV = acl_cv_rpath=no
 GNUTLS_CONF_OPT = --with-libgcrypt --without-libgcrypt-prefix \
-		--without-p11-kit
+		--without-p11-kit --disable-rpath
 GNUTLS_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))