[vlc-commits] contrib: gnutls: disable getentropy in gnutls configure

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Wed Aug  9 21:39:33 2017 +0200| [f434298ad77b22b11a44f9f693779ab8dd2065f5] | committer: David Fuhrmann

contrib: gnutls: disable getentropy in gnutls configure

getentropy has been introduced only in 10.12, so it is not
available on earlier osx versions. As VLC will support up to 10.7,
disable the check.

refs #18476

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f434298ad77b22b11a44f9f693779ab8dd2065f5
---

 .../src/gnutls/gnutls-disable-getentropy-osx.patch   | 20 ++++++++++++++++++++
 contrib/src/gnutls/rules.mak                         |  1 +
 2 files changed, 21 insertions(+)

diff --git a/contrib/src/gnutls/gnutls-disable-getentropy-osx.patch b/contrib/src/gnutls/gnutls-disable-getentropy-osx.patch
new file mode 100644
index 0000000000..fee755c034
--- /dev/null
+++ b/contrib/src/gnutls/gnutls-disable-getentropy-osx.patch
@@ -0,0 +1,20 @@
+--- gnutls/configure.ac	2016-07-05 18:34:43.000000000 +0200
++++ gnutls.new/configure.ac	2017-08-09 21:57:44.000000000 +0200
+@@ -175,6 +175,9 @@
+ 		   enable_getrandom=getrandom],
+ 		  [AC_MSG_RESULT(no)])
+ 
++if test "$have_macosx" = "yes"; then
++AC_MSG_CHECKING([for getentropy disabled for OSX])
++else
+ AC_MSG_CHECKING([for getentropy])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([
+ 	   #include <unistd.h>],[
+@@ -184,6 +187,7 @@
+ 		   AC_DEFINE([HAVE_GETENTROPY], 1, [Enable the OpenBSD getentropy function])
+ 		   enable_getrandom=getentropy],
+ 		  [AC_MSG_RESULT(no)])
++fi
+ 
+ dnl Try the hooks.m4
+ LIBGNUTLS_HOOKS
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index d9b2b2e5cb..41ba844d23 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -37,6 +37,7 @@ endif
 	$(APPLY) $(SRC)/gnutls/mac-keychain-lookup.patch
 ifdef HAVE_MACOSX
 	$(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-osx.patch
+	$(APPLY) $(SRC)/gnutls/gnutls-disable-getentropy-osx.patch
 endif
 	$(APPLY) $(SRC)/gnutls/gnutls-libidn.patch
 	$(call pkg_static,"lib/gnutls.pc.in")