vlc | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Thu May 28 09:30:45 2020 +0200| [f442ecf5afd8b71125b074bacb8379f6c51db40e] | committer: Steve Lhomme
contrib: gnutls: add hogweed/nettle in pkg-config via sed So that patches changing the same file still apply regardless of this change. And we do it after all patches are done. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f442ecf5afd8b71125b074bacb8379f6c51db40e --- contrib/src/gnutls/gnutls-pkgconfig-static.patch | 11 ----------- contrib/src/gnutls/rules.mak | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/contrib/src/gnutls/gnutls-pkgconfig-static.patch b/contrib/src/gnutls/gnutls-pkgconfig-static.patch deleted file mode 100644 index 3363e96109..0000000000 --- a/contrib/src/gnutls/gnutls-pkgconfig-static.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru gnutls-3.5.16/lib/gnutls.pc.in gnutls-3.5.16.patched/lib/gnutls.pc.in ---- gnutls-3.5.16/lib/gnutls.pc.in 2017-03-28 20:20:50.000000000 +0300 -+++ gnutls-3.5.16.patched/lib/gnutls.pc.in 2017-12-26 16:47:54.502835713 +0200 -@@ -19,6 +19,6 @@ - URL: http://www.gnutls.org/ - Version: @VERSION@ - Libs: -L${libdir} -lgnutls --Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@ -+Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@ @HOGWEED_LIBS@ @NETTLE_LIBS@ - @GNUTLS_REQUIRES_PRIVATE@ - Cflags: -I${includedir} diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak index 58fd8e8978..3e3a020008 100644 --- a/contrib/src/gnutls/rules.mak +++ b/contrib/src/gnutls/rules.mak @@ -21,7 +21,6 @@ $(TARBALLS)/gnutls-$(GNUTLS_VERSION).tar.xz: gnutls: UNPACK_DIR=gnutls-3.6.7 gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls $(UNPACK) - $(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-static.patch ifdef HAVE_WIN32 cd $(UNPACK_DIR) && sed -i.orig -e s/"@INET_PTON_LIB@ @LIBPTHREAD@"/"@INET_PTON_LIB@ -lcrypt32 @LIBPTHREAD@"/g lib/gnutls.pc.in # disable the dllimport in static linking (pkg-config --static doesn't handle Cflags.private) @@ -30,6 +29,7 @@ endif ifdef HAVE_ANDROID $(APPLY) $(SRC)/gnutls/no-create-time-h.patch endif + cd $(UNPACK_DIR) && sed -i.orig -e 's/@LIBATOMIC_LIBS@/@LIBATOMIC_LIBS@ @HOGWEED_LIBS@ @NETTLE_LIBS@/' lib/gnutls.pc.in $(call pkg_static,"lib/gnutls.pc.in") $(UPDATE_AUTOCONFIG) $(MOVE) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
