[vlc-commits] contrib: gnutls: fix linking with static nettle.

[Konstantin Pavlov]

vlc | branch: master | Konstantin Pavlov <thresh at videolan.org> | Thu Nov  3 02:12:27 2016 +0300| [2198fe038baa8f5bcdd7acb92ced92a5c694058a] | committer: Konstantin Pavlov

contrib: gnutls: fix linking with static nettle.

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

 contrib/src/gnutls/gnutls-pkgconfig-static.patch | 10 ++++++++++
 contrib/src/gnutls/rules.mak                     |  1 +
 2 files changed, 11 insertions(+)

diff --git a/contrib/src/gnutls/gnutls-pkgconfig-static.patch b/contrib/src/gnutls/gnutls-pkgconfig-static.patch
new file mode 100644
index 0000000..361d651
--- /dev/null
+++ b/contrib/src/gnutls/gnutls-pkgconfig-static.patch
@@ -0,0 +1,10 @@
+--- gnutls/lib/gnutls.pc.in    2015-11-03 21:47:28.000000000 +0000
++++ gnutls.patched/lib/gnutls.pc.in    2016-11-02 22:53:04.272156182 +0000
+@@ -19,6 +19,6 @@
+ URL: http://www.gnutls.org/
+ Version: @VERSION@
+ Libs: -L${libdir} -lgnutls
+-Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
++Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @NETTLE_LIBS@ @LIBIDN_LIBS@ @HOGWEED_LIBS@
+ @GNUTLS_REQUIRES_PRIVATE@
+ Cflags: -I${includedir}
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index d7efcea..2b9ad03 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -38,6 +38,7 @@ ifdef HAVE_MACOSX
 	$(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-osx.patch
 endif
 	$(APPLY) $(SRC)/gnutls/gnutls-libidn.patch
+	$(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-static.patch
 	$(call pkg_static,"lib/gnutls.pc.in")
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)