From 869a4c6fea27e9455191e2390a25a7f48afbce25 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 14 Dec 2015 15:41:38 -0300 Subject: [PATCH] gnutls: remove manual tools disabling kludge It's no longer required, tools are guarded by ENABLE_TOOLS in Makefile.am and excluded accordingly. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gnutls/gnutls.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 2855e8f4fd..0ab521e916 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -20,7 +20,8 @@ GNUTLS_CONF_OPTS = \ --enable-openssl-compatibility \ --with-libnettle-prefix=$(STAGING_DIR)/usr \ --with-librt-prefix=$(STAGING_DIR) \ - --without-tpm + --without-tpm \ + $(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools) GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \ ac_cv_header_wchar_h=$(if $(BR2_USE_WCHAR),yes,no) \ gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) \ @@ -80,11 +81,4 @@ else GNUTLS_CONF_OPTS += --without-zlib endif -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 += $(if $(BR2_PACKAGE_GNUTLS_TOOLS),,GNUTLS_DISABLE_TOOLS) - $(eval $(autotools-package)) -- 2.30.2