Skip to contentSkip to conversation

gnutls: remove manual doc disabling kludge

PATCH New Gustavo Zacarias 2 participants 3 messages Dec 14, 2015 – Dec 15, 2015

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/2 gnutls: remove manual doc disabling kludge

It's no longer required, SUBDIRS += doc is guarded by ENABLE_DOC in Makefile.am and the only place where it's used regardless is in dist-hook which isn't used by buildroot.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/gnutls/gnutls.mk | 6 ------
 1 file changed, 6 deletions(-)
package/gnutls/gnutls.mk +0 -6
index 737e4b1..b8c5461 100644
@@ -82,17 +82,11 @@ else
 GNUTLS_CONF_OPTS += --without-zlib
 endif
 
-# 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))
Signature · 1 line
2.4.10
author
#1 lore raw

PATCH 2/2 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 <[email protected]>
---
 package/gnutls/gnutls.mk | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
package/gnutls/gnutls.mk +2 -8
index b8c5461..d63df99 100644
@@ -22,7 +22,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) \

@@ -82,11 +83,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))
Signature · 1 line
2.4.10
#2 lore raw

PATCH 1/2 gnutls: remove manual doc disabling kludge

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 8 lines · Gustavo Zacarias

It's no longer required, SUBDIRS += doc is guarded by ENABLE_DOC in Makefile.am and the only place where it's used regardless is in dist-hook which isn't used by buildroot.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/gnutls/gnutls.mk | 6 ------
 1 file changed, 6 deletions(-)

Both applied, thanks.

Thomas

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