]> git.sesse.net Git - vlc/commitdiff
Contribs: apply OSX patch only on OSX
authorJean-Baptiste Kempf <jb@videolan.org>
Sat, 5 Jul 2014 22:59:01 +0000 (00:59 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Sat, 5 Jul 2014 22:59:25 +0000 (00:59 +0200)
Else, it conflicts with Win32 patch and fails to compile

contrib/src/gnutls/rules.mak

index f7f9aa61aae166cc11cbbc047bccadab1ba11efc..e9533d17d32178d1c9ec8d1175bc3b452b870669 100644 (file)
@@ -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)