File gnutls-3.1.11-misc.patch of Package mingw64-gnutls

Overview Repositories Revisions Requests Users Attributes Meta

File gnutls-3.1.11-misc.patch of Package mingw64-gnutls (Revision e6626241083a61f1cb8c74666a76bf91)

Currently displaying revision e6626241083a61f1cb8c74666a76bf91 , Show latest

--- gnutls-3.1.11/configure.ac	2013-05-05 12:39:09.000000000 +0200
+++ gnutls-3.1.11/configure.ac	2013-05-19 21:23:38.504780886 +0200
@@ -38,7 +38,7 @@
 AC_PROG_CC
 gl_EARLY
 AM_PROG_AS
-dnl AM_PROG_AR
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 AC_PROG_CXX
 
 # For includes/gnutls/gnutls.h.in.
--- gnutls-3.1.11/extra/Makefile.am	2013-04-24 10:34:02.000000000 +0200
+++ gnutls-3.1.11/extra/Makefile.am	2013-05-19 21:40:47.273862267 +0200
@@ -61,17 +61,11 @@
 if ENABLE_MINITASN1
 libgnutls_openssl_la_LIBADD += ../lib/minitasn1/libminitasn1.la
 else
-libgnutls_openssl_la_LIBADD += $(LTLIBTASN1)
+libgnutls_openssl_la_LIBADD += $(LIBTASN1_LIBS)
 endif
 
 libgnutls_openssl_la_LIBADD += $(LIBSOCKET)
 
-if HAVE_LD_OUTPUT_DEF
-libgnutls_openssl_la_LDFLAGS += \
-	-Wl,--output-def,libgnutls-openssl-$(DLL_VERSION).def
-libgnutls-openssl-$(DLL_VERSION).def: libgnutls-openssl.la
-defexec_DATA += libgnutls-openssl-$(DLL_VERSION).def
-endif
 endif
 
 DISTCLEANFILES = $(defexec_DATA)
--- gnutls-3.1.11/gl/iconv.in.h	2013-04-24 10:34:02.000000000 +0200
+++ gnutls-3.1.11/gl/iconv.in.h	2013-05-19 21:16:22.786085490 +0200
@@ -74,11 +74,11 @@
 #  endif
 _GL_FUNCDECL_RPL (iconv, size_t,
                   (iconv_t cd,
-                   @ICONV_CONST@ char **inbuf, size_t *inbytesleft,
+                   ICONV_CONST char **inbuf, size_t *inbytesleft,
                    char **outbuf, size_t *outbytesleft));
 _GL_CXXALIAS_RPL (iconv, size_t,
                   (iconv_t cd,
-                   @ICONV_CONST@ char **inbuf, size_t *inbytesleft,
+                   ICONV_CONST char **inbuf, size_t *inbytesleft,
                    char **outbuf, size_t *outbytesleft));
 # else
 _GL_CXXALIAS_SYS (iconv, size_t,
--- gnutls-3.1.11/lib/Makefile.am	2013-04-27 10:04:48.000000000 +0200
+++ gnutls-3.1.11/lib/Makefile.am	2013-05-19 21:39:34.300548834 +0200
@@ -144,14 +144,6 @@
 libgnutls_la_LIBADD += nettle/libcrypto.la
 endif
 
-if HAVE_LD_OUTPUT_DEF
-libgnutls_la_LDFLAGS += -Wl,--output-def,libgnutls-$(DLL_VERSION).def
-libgnutls-$(DLL_VERSION).def: libgnutls.la
-defexecdir = $(bindir)
-defexec_DATA = libgnutls-$(DLL_VERSION).def
-DISTCLEANFILES += $(defexec_DATA)
-endif
-
 if WINDOWS
 thirdparty_libadd += -lcrypt32
 endif
@@ -195,9 +187,3 @@
 
 libgnutls_xssl_la_LDFLAGS += -version-info $(LT_XSSL_CURRENT):$(LT_XSSL_REVISION):$(LT_XSSL_AGE)
 
-if HAVE_LD_OUTPUT_DEF
-libgnutls_xssl_la_LDFLAGS += \
-	-Wl,--output-def,libgnutls-xssl-$(DLL_VERSION).def
-libgnutls-xssl-$(DLL_VERSION).def: libgnutls-xssl.la
-defexec_DATA += libgnutls-xssl-$(DLL_VERSION).def
-endif

Places

File gnutls-3.1.11-misc.patch of Package mingw64-gnutls (Revision e6626241083a61f1cb8c74666a76bf91)

Places