[vlc-commits] Contribs: apply OSX patch only on OSX
Jean-Baptiste Kempf
git at videolan.org
Sun Jul 6 00:59:39 CEST 2014
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jul 6 00:59:01 2014 +0200| [f836a94d9c4a78a03cc412d5559d274dc2df459b] | committer: Jean-Baptiste Kempf
Contribs: apply OSX patch only on OSX
Else, it conflicts with Win32 patch and fails to compile
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f836a94d9c4a78a03cc412d5559d274dc2df459b
---
contrib/src/gnutls/rules.mak | 2 ++
1 file changed, 2 insertions(+)
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index f7f9aa6..e9533d1 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -29,7 +29,9 @@ endif
$(APPLY) $(SRC)/gnutls/read-file-limits.h.patch
$(APPLY) $(SRC)/gnutls/downgrade-automake-requirement.patch
$(APPLY) $(SRC)/gnutls/mac-keychain-lookup.patch
+ifdef HAVE_MACOSX
$(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-osx.patch
+endif
$(call pkg_static,"lib/gnutls.pc.in")
$(UPDATE_AUTOCONFIG)
$(MOVE)
More information about the vlc-commits
mailing list