Commit a230bc23 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

contribs: gnutls: Fix win32 build

parent ce1a2fbb
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
URL: http://www.gnutls.org/ URL: http://www.gnutls.org/
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lgnutls 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@
+Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ -lcrypt32 @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ +Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ -lcrypt32 @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @NETTLE_LIBS@ @LIBIDN_LIBS@ @HOGWEED_LIBS@
@GNUTLS_REQUIRES_PRIVATE@ @GNUTLS_REQUIRES_PRIVATE@
Cflags: -I${includedir} Cflags: -I${includedir}
--- gnutls.old/lib/includes/gnutls/gnutls.h.in 2016-07-01 22:44:49.319398504 +0200 --- gnutls.old/lib/includes/gnutls/gnutls.h.in 2016-07-01 22:44:49.319398504 +0200
......
...@@ -19,6 +19,7 @@ $(TARBALLS)/gnutls-$(GNUTLS_VERSION).tar.xz: ...@@ -19,6 +19,7 @@ $(TARBALLS)/gnutls-$(GNUTLS_VERSION).tar.xz:
gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls
$(UNPACK) $(UNPACK)
$(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-static.patch
ifdef HAVE_WIN32 ifdef HAVE_WIN32
$(APPLY) $(SRC)/gnutls/gnutls-win32.patch $(APPLY) $(SRC)/gnutls/gnutls-win32.patch
$(APPLY) $(SRC)/gnutls/gnutls-mingw64.patch $(APPLY) $(SRC)/gnutls/gnutls-mingw64.patch
...@@ -38,7 +39,6 @@ ifdef HAVE_MACOSX ...@@ -38,7 +39,6 @@ ifdef HAVE_MACOSX
$(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-osx.patch $(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-osx.patch
endif endif
$(APPLY) $(SRC)/gnutls/gnutls-libidn.patch $(APPLY) $(SRC)/gnutls/gnutls-libidn.patch
$(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-static.patch
$(call pkg_static,"lib/gnutls.pc.in") $(call pkg_static,"lib/gnutls.pc.in")
$(UPDATE_AUTOCONFIG) $(UPDATE_AUTOCONFIG)
$(MOVE) $(MOVE)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment