summaryrefslogtreecommitdiffstats
path: root/package/gnutls/gnutls.mk
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2012-12-28 09:47:17 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2012-12-28 21:55:48 +0100
commita8293a376574c439041de48e6571a4b82f7d2c3b (patch)
tree85b6329f83f894d6b24b8b30c3c8afaeaab0416f /package/gnutls/gnutls.mk
parentc89cc4b4b311b927d0c02af5717c6cc1150a1480 (diff)
downloadbuildroot-novena-a8293a376574c439041de48e6571a4b82f7d2c3b.tar.gz
buildroot-novena-a8293a376574c439041de48e6571a4b82f7d2c3b.zip
gnutls: bump to version 3.1.5
[Peter: add comment when tools not available] Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/gnutls/gnutls.mk')
-rw-r--r--package/gnutls/gnutls.mk26
1 files changed, 19 insertions, 7 deletions
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 506d7f5b8..e27c1a358 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -4,18 +4,30 @@
#
#############################################################
-GNUTLS_VERSION = 2.12.20
-GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.bz2
+GNUTLS_VERSION = 3.1.5
+GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
-GNUTLS_LICENSE = GPLv3+ LGPLv2.1+
+GNUTLS_LICENSE = GPLv3+ LGPLv3
GNUTLS_LICENSE_FILES = COPYING lib/COPYING
-GNUTLS_DEPENDENCIES = host-pkgconf libgcrypt $(if $(BR2_PACKAGE_ZLIB),zlib)
-GNUTLS_CONF_ENV = acl_cv_rpath=no \
+GNUTLS_DEPENDENCIES = host-pkgconf nettle $(if $(BR2_PACKAGE_ZLIB),zlib)
+GNUTLS_CONF_OPT = --with-libnettle-prefix=$(STAGING_DIR)/usr --disable-rpath
+GNUTLS_CONF_ENV = gl_cv_socket_ipv6=$(if $(BR2_INET_IPV6),yes,no) \
ac_cv_header_wchar_h=$(if $(BR2_USE_WCHAR),yes,no) \
gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) \
gt_cv_c_wint_t=$(if $(BR2_USE_WCHAR),yes,no)
-GNUTLS_CONF_OPT = --with-libgcrypt --without-libgcrypt-prefix \
- --without-p11-kit --disable-rpath
GNUTLS_INSTALL_STAGING = YES
+# Some examples in doc/examples use wchar
+define GNUTLS_DISABLE_DOCS
+ $(SED) 's/ doc / /' $(@D)/Makefile.in
+endef
+
+define GNUTLS_DISABLE_TOOLS
+ $(SED) 's/\$$(PROGRAMS)//' $(@D)/src/Makefile.in
+ $(SED) 's/) install-exec-am/)/' $(@D)/src/Makefile.in
+endef
+
+GNUTLS_POST_PATCH_HOOKS += GNUTLS_DISABLE_DOCS
+GNUTLS_POST_PATCH_HOOKS += $(if $(BR2_PACKAGE_GNUTLS_TOOLS),,GNUTLS_DISABLE_TOOLS)
+
$(eval $(autotools-package))