[vlc-commits] COntribs: fix gnutls build on OSX

Jean-Baptiste Kempf git at videolan.org
Tue Sep 2 18:04:31 CEST 2014


vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Sep  2 02:12:32 2014 +0200| [0675065f455571bc2b936ab7c6c15c7d04fb5f0c] | committer: Jean-Baptiste Kempf

COntribs: fix gnutls build on OSX

(cherry picked from commit 407756f250d57b50b6bd20be74c7247c94ce3a3f)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/gnutls/gnutls-pkgconfig-osx.patch |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/contrib/src/gnutls/gnutls-pkgconfig-osx.patch b/contrib/src/gnutls/gnutls-pkgconfig-osx.patch
index 28fa970..82305ec 100644
--- a/contrib/src/gnutls/gnutls-pkgconfig-osx.patch
+++ b/contrib/src/gnutls/gnutls-pkgconfig-osx.patch
@@ -39,11 +39,12 @@
  Libs.private: @UNBOUND_LIBS@
  Requires.private: gnutls
  Cflags: -I${includedir}
---- gnutls/lib/gnutls.pc.in.orig	2014-08-26 00:12:38.680157601 +0200
-+++ gnutls/lib/gnutls.pc.in	2014-08-26 00:13:14.807453832 +0200
-@@ -20,4 +20,4 @@
+--- gnutls-3.2.17/lib/gnutls.pc.in.orig	2014-09-02 02:11:18.408515190 +0200
++++ gnutls-3.2.17/lib/gnutls.pc.in	2014-09-02 02:11:45.615686000 +0200
+@@ -20,5 +20,5 @@
  Version: @VERSION@
- @GNUTLS_REQUIRES_PRIVATE@
+ Libs: -L${libdir} -lgnutls
+ Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
+- at GNUTLS_REQUIRES_PRIVATE@
++ at GNUTLS_REQUIRES_PRIVATE@ @INTL_MACOSX_LIBS@
  Cflags: -I${includedir}
--Libs:  -L${libdir} -lgnutls  @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
-+Libs:  -L${libdir} -lgnutls  @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @INTL_MACOSX_LIBS@



More information about the vlc-commits mailing list