[vlc-devel] [PATCH 2/2] gnutls: more generic way to force the available API entries

Steve Lhomme robux4 at videolabs.io
Mon Feb 8 17:34:09 CET 2016


From: Steve Lhomme <robux4 at gmail.com>

---
 contrib/src/gnutls/rules.mak | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 8886f06..533da2a 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -55,19 +55,20 @@ GNUTLS_CONF := \
 	--disable-doc \
 	--disable-tests \
 	$(HOSTCONF)
+GNUTLS_ENV := $(HOSTVARS)
 
 DEPS_gnutls = nettle $(DEPS_nettle)
 ifdef HAVE_VISUALSTUDIO
 DEPS_gnutls += sys_param
 endif
 
-.gnutls: gnutls
-	$(RECONF)
 ifdef HAVE_ANDROID
-	cd $< && $(HOSTVARS) gl_cv_header_working_stdint_h=yes ./configure $(GNUTLS_CONF)
-else
-	cd $< && $(HOSTVARS) ./configure $(GNUTLS_CONF)
+GNUTLS_ENV += gl_cv_header_working_stdint_h=yes
 endif
+
+.gnutls: gnutls
+	$(RECONF)
+	cd $< && $(GNUTLS_ENV) ./configure $(GNUTLS_CONF)
 	cd $</gl && $(MAKE) install
 	cd $</lib && $(MAKE) install
 	touch $@
-- 
2.7.0.windows.1



More information about the vlc-devel mailing list