git.sesse.net Git - vlc/blob - extras/contrib/src/Patches/gnutls-win32.patch

   1 --- gnutls-2.2.5/gl/gai_strerror.c      2008-02-21 08:58:18.000000000 +0100
   2 +++ gnutls/gl/gai_strerror.c    2008-05-22 08:20:56.000000000 +0200
   3 @@ -62,7 +62,7 @@
   4      { EAI_IDN_ENCODE, N_("Parameter string not correctly encoded") }
   5  #endif
   6    };
   7 -
   8 +#ifndef _WIN32
   9  const char *
  10  gai_strerror (int code)
  11  {
  12 @@ -73,6 +73,7 @@
  13
  14    return _("Unknown error");
  15  }
  16 +#endif
  17  #ifdef _LIBC
  18  libc_hidden_def (gai_strerror)
  19  #endif
  20 --- gnutls-2.2.5/configure.in   2008-05-19 21:45:47.000000000 +0200
  21 +++ gnutls/configure.in 2008-05-22 08:19:02.000000000 +0200
  22 @@ -200,8 +200,6 @@
  23         fi
  24  fi
  25
  26 -# Needs to be called outside of 'if' clause.
  27 -AM_CONDITIONAL(HAVE_LD_OUTPUT_DEF, test "$output_def" = "yes")
  28  AM_CONDITIONAL([HAVE_GCC_GNU89_INLINE_OPTION],
  29                 [test "$_gcc_gnu89_inline" = "yes"])
  30
  31 @@ -715,6 +713,10 @@
  32  AC_SUBST(LIBGNUTLS_LIBS)
  33  AC_SUBST(LIBGNUTLS_CFLAGS)
  34
  35 +
  36 +# Needs to be called outside of 'if' clause.
  37 +AM_CONDITIONAL(HAVE_LD_OUTPUT_DEF, test "$output_def" = "yes")
  38 +
  39  LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LTLIBOPENCDK $LZO_LIBS $LIBGNUTLS_LIBS"
  40  LIBGNUTLS_EXTRA_CFLAGS="$INCOPENCDK -I${includedir}"
  41  AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
  42 --- gnutls-2.2.5/lib/Makefile.in        2008-05-19 21:48:35.000000000 +0200
  43 +++ gnutls/lib/Makefile.in      2008-05-22 08:30:01.000000000 +0200
  44 @@ -643,7 +643,6 @@
  45  target_cpu = @target_cpu@
  46  target_os = @target_os@
  47  target_vendor = @target_vendor@
  48 -top_build_prefix = @top_build_prefix@
  49  top_builddir = @top_builddir@
  50  top_srcdir = @top_srcdir@
  51  SUBDIRS = x509 $(am__append_1)
  52 @@ -712,7 +711,7 @@
  53  libgnutls_la_LIBADD = ../lgl/liblgnu.la x509/libgnutls_x509.la \
  54         @LTLIBZ@ $(LIBGCRYPT_LIBS) @LTLIBINTL@ $(am__append_6)
  55  @HAVE_LD_OUTPUT_DEF_TRUE@defexecdir = $(bindir)
  56 -@HAVE_LD_OUTPUT_DEF_TRUE@defexec_DATA = libgnutls-$(SOVERSION).def
  57 +@HAVE_LD_OUTPUT_DEF_TRUE@defexec_DATA =
  58
  59  # C++ library
  60  @ENABLE_CXX_TRUE@CPP_OBJECTS = gnutlsxx.cpp
  61 --- gnutls-2.2.5/lib/Makefile.am        2008-05-19 21:45:13.000000000 +0200
  62 +++ gnutls/lib/Makefile.am      2008-05-22 08:44:16.000000000 +0200
  63 @@ -123,7 +123,7 @@
  64  if HAVE_LD_OUTPUT_DEF
  65  libgnutls_la_LDFLAGS += -Wl,--output-def,libgnutls-$(SOVERSION).def
  66  defexecdir = $(bindir)
  67 -defexec_DATA = libgnutls-$(SOVERSION).def
  68 +defexec_DATA =
  69  DISTCLEANFILES += $(defexec_DATA)
  70  endif
  71