Skip to contentSkip to conversation

libgsasl: fix auto dependencies

PATCH New Gustavo Zacarias 3 participants 4 messages Nov 26, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libgsasl: fix auto dependencies

IDN can be picked up from the distro installation so use a prefix when it's available or otherwise just disable it, fixes:
http://autobuild.buildroot.org/results/5d9/5d9baf528c47c5167ec8d2a6941cb06b4ca761ca/

Also disable libgcrypt support which wasn't accounted for and doesn't seem to work either to possibly avoid the same problem.

---
 package/libgsasl/libgsasl.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
package/libgsasl/libgsasl.mk +9 -1
index f2660ca..00ce8e0 100644
@@ -9,6 +9,14 @@ LIBGSASL_SITE = $(BR2_GNU_MIRROR)/gsasl
 LIBGSASL_LICENSE = LGPLv2.1+ (library), GPLv3+ (programs)
 LIBGSASL_LICENSE_FILES = README COPYING.LIB COPYING
 LIBGSASL_INSTALL_STAGING = YES
-LIBGSASL_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBIDN),libidn)
+# It doesn't seem to build with our libgcrypt so better be safe
+LIBGSASL_CONF_OPTS = --without-libgcrypt
+
+ifeq ($(BR2_PACKAGE_LIBIDN),y)
+LIBGSASL_CONF_OPTS += --with-libidn-prefix=$(STAGING_DIR)/usr
+LIBGSASL_DEPENDENCIES += libidn
+else
+LIBGSASL_CONF_OPTS += --without-stringprep
+endif
 
 $(eval $(autotools-package))
Signature · 1 line
2.4.10
#1 lore raw

PATCH 1/1 libgsasl: fix auto dependencies

Gustavo,

Quoted 20 lines · Gustavo Zacarias

IDN can be picked up from the distro installation so use a prefix when it's available or otherwise just disable it, fixes:
http://autobuild.buildroot.org/results/5d9/5d9baf528c47c5167ec8d2a6941cb06b4ca761ca/

Also disable libgcrypt support which wasn't accounted for and doesn't seem to work either to possibly avoid the same problem.

---
 package/libgsasl/libgsasl.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
package/libgsasl/libgsasl.mk +0 -0
index f2660ca..00ce8e0 100644
@@ -9,6 +9,14 @@ LIBGSASL_SITE = $(BR2_GNU_MIRROR)/gsasl
 LIBGSASL_LICENSE = LGPLv2.1+ (library), GPLv3+ (programs)
 LIBGSASL_LICENSE_FILES = README COPYING.LIB COPYING
 LIBGSASL_INSTALL_STAGING = YES

package/libgsasl/libgsasl.mk LIBGSASL_SITE = $(BR2_GNU_MIRROR)/gsasl · line 20

Quoted 10 lines
package/libgsasl/libgsasl.mk +9 -1
-LIBGSASL_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBIDN),libidn)
+# It doesn't seem to build with our libgcrypt so better be safe
+LIBGSASL_CONF_OPTS = --without-libgcrypt
+
+ifeq ($(BR2_PACKAGE_LIBIDN),y)
+LIBGSASL_CONF_OPTS += --with-libidn-prefix=$(STAGING_DIR)/usr
+LIBGSASL_DEPENDENCIES += libidn
+else
+LIBGSASL_CONF_OPTS += --without-stringprep
+endif

It is not immediately clear why --without-stringprep is used here instead of --without-libidn, so this probably warrants a comment in the code or at least in the commit log.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 libgsasl: fix auto dependencies

Quoted 3 lines · Thomas Petazzoni

It is not immediately clear why --without-stringprep is used here instead of --without-libidn, so this probably warrants a comment in the code or at least in the commit log.

Hi, the usual, upstream are inconsistent morons ;) Regards.

#3 lore raw

PATCH 1/1 libgsasl: fix auto dependencies

In reply to Gustavo Zacarias
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

IDN can be picked up from the distro installation so use a prefix when it's available or otherwise just disable it, fixes:
http://autobuild.buildroot.org/results/5d9/5d9baf528c47c5167ec8d2a6941cb06b4ca761ca/

Also disable libgcrypt support which wasn't accounted for and doesn't seem to work either to possibly avoid the same problem.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard