summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2015-12-14 15:41:38 -0300
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-12-15 21:51:13 +0100
commit869a4c6fea27e9455191e2390a25a7f48afbce25 (patch)
tree84cf70e116477c08c2b4587b7241194fdb400bbc
parent5aca274c7b8fe60fb76903f6c408db4612b0891c (diff)
downloadbuildroot-869a4c6fea27e9455191e2390a25a7f48afbce25.tar.gz
buildroot-869a4c6fea27e9455191e2390a25a7f48afbce25.zip
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 <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/gnutls/gnutls.mk10
1 files 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))
OpenPOWER on IntegriCloud