[vlc-commits] contribs: gcrypt: Fix pthread detection

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Apr 20 17:26:02 2017 +0200| [6c2edaa0c0aedce5b0596826e056057d5f2d1937] | committer: Hugo Beauzée-Luyssen

contribs: gcrypt: Fix pthread detection

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

 contrib/src/gcrypt/fix-pthread-detection.patch | 24 ++++++++++++++++++++++++
 contrib/src/gcrypt/rules.mak                   |  1 +
 2 files changed, 25 insertions(+)

diff --git a/contrib/src/gcrypt/fix-pthread-detection.patch b/contrib/src/gcrypt/fix-pthread-detection.patch
new file mode 100644
index 0000000000..8c69abae9d
--- /dev/null
+++ b/contrib/src/gcrypt/fix-pthread-detection.patch
@@ -0,0 +1,24 @@
+--- libgcrypt/configure.ac.old	2017-04-20 16:49:00.239092950 +0200
++++ libgcrypt/configure.ac	2017-04-20 16:57:18.205011934 +0200
+@@ -215,7 +215,6 @@
+ print_egd_notice=no
+ have_w32_system=no
+ have_w32ce_system=no
+-have_pthread=no
+ 
+ 
+ # Setup some stuff depending on host.
+@@ -751,10 +750,9 @@
+ # Check whether pthreads is available
+ #
+ if test "$have_w32_system" != yes; then
+-  AC_CHECK_LIB(pthread,pthread_create,have_pthread=yes)
+-  if test "$have_pthread" = yes; then
+-    AC_DEFINE(HAVE_PTHREAD, 1 ,[Define if we have pthread.])
+-  fi
++  AC_SEARCH_LIBS(pthread_create, pthread,[
++      AC_DEFINE(HAVE_PTHREAD, 1 ,[Define if we have pthread.])
++  ])
+ fi
+ 
+ 
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 141b32d6b4..8b0fafbd33 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -12,6 +12,7 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
 libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
 	$(UNPACK)
 	$(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch
+	$(APPLY) $(SRC)/gcrypt/fix-pthread-detection.patch
 ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/gcrypt/winrt.patch
 endif