mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-27 13:16:35 +00:00
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>
This commit is contained in:
parent
5aca274c7b
commit
869a4c6fea
@ -20,7 +20,8 @@ GNUTLS_CONF_OPTS = \
|
|||||||
--enable-openssl-compatibility \
|
--enable-openssl-compatibility \
|
||||||
--with-libnettle-prefix=$(STAGING_DIR)/usr \
|
--with-libnettle-prefix=$(STAGING_DIR)/usr \
|
||||||
--with-librt-prefix=$(STAGING_DIR) \
|
--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 \
|
GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \
|
||||||
ac_cv_header_wchar_h=$(if $(BR2_USE_WCHAR),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_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) \
|
||||||
@ -80,11 +81,4 @@ else
|
|||||||
GNUTLS_CONF_OPTS += --without-zlib
|
GNUTLS_CONF_OPTS += --without-zlib
|
||||||
endif
|
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))
|
$(eval $(autotools-package))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user