diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2015-03-31 15:09:46 +0100 |
|---|---|---|
| committer | Luis de Bethencourt <luis.bg@samsung.com> | 2015-03-31 15:10:23 +0100 |
| commit | 93e357178c2e98f81150445274663423bb4f84cf (patch) | |
| tree | 79ee7fc5cf1b40327b240464903377af491f4ea5 /recipes | |
| parent | eb593d121a89affc6271466e0257f58921bb9564 (diff) | |
gnutls.recipe: Fix corrupted patches
Somehow they became corrupted during the transfer
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/gnutls/0001-configure-vasprintf-is-defined-in-stdio.h.patch | 17 | ||||
| -rw-r--r-- | recipes/gnutls/0002-configure-Update-gettext-version-to-0.19.patch | 9 |
2 files changed, 14 insertions, 12 deletions
diff --git a/recipes/gnutls/0001-configure-vasprintf-is-defined-in-stdio.h.patch b/recipes/gnutls/0001-configure-vasprintf-is-defined-in-stdio.h.patch index 5d85213e..bf025680 100644 --- a/recipes/gnutls/0001-configure-vasprintf-is-defined-in-stdio.h.patch +++ b/recipes/gnutls/0001-configure-vasprintf-is-defined-in-stdio.h.patch @@ -15,7 +15,7 @@ index 5d13ff7..40a01d7 100644 --- a/configure.ac +++ b/configure.ac @@ -156,8 +156,9 @@ AC_C_BIGENDIAN - + dnl No fork on MinGW, disable some self-tests until we fix them. dnl Check clock_gettime and pthread_mutex_lock in libc (avoid linking to other libs) -AC_CHECK_FUNCS([fork inet_ntop inet_pton getrusage getpwuid_r nanosleep daemon getpid clock_gettime iconv localtime vasprintf],,) @@ -25,22 +25,22 @@ index 5d13ff7..40a01d7 100644 +if test "$ac_cv_have_decl_vasprintf" != "yes";then AC_MSG_CHECKING([for va_copy]) AC_LINK_IFELSE([AC_LANG_PROGRAM([ - #include <stdarg.h> + #include <stdarg.h> @@ -178,6 +179,8 @@ if test "$ac_cv_func_vasprintf" != "yes";then - [AC_MSG_RESULT(no) - AC_MSG_ERROR([Your system lacks vasprintf() and va_copy()])]) - ]) + [AC_MSG_RESULT(no) + AC_MSG_ERROR([Your system lacks vasprintf() and va_copy()])]) + ]) +else + AC_DEFINE(HAVE_VASPRINTF, 1, [Have vasprintf()]) fi - + AM_CONDITIONAL(HAVE_FORK, test "$ac_cv_func_fork" != "no") diff --git a/gl/m4/vasprintf.m4 b/gl/m4/vasprintf.m4 index c76c99c..42c71c2 100644 --- a/gl/m4/vasprintf.m4 +++ b/gl/m4/vasprintf.m4 @@ -7,8 +7,8 @@ dnl with or without modifications, as long as this notice is preserved. - + AC_DEFUN([gl_FUNC_VASPRINTF], [ - AC_CHECK_FUNCS([vasprintf]) @@ -50,5 +50,6 @@ index c76c99c..42c71c2 100644 gl_REPLACE_VASPRINTF fi ]) --- +-- 2.1.0 + diff --git a/recipes/gnutls/0002-configure-Update-gettext-version-to-0.19.patch b/recipes/gnutls/0002-configure-Update-gettext-version-to-0.19.patch index 328ee576..e2185f69 100644 --- a/recipes/gnutls/0002-configure-Update-gettext-version-to-0.19.patch +++ b/recipes/gnutls/0002-configure-Update-gettext-version-to-0.19.patch @@ -12,13 +12,14 @@ index 40a01d7..87c3337 100644 --- a/configure.ac +++ b/configure.ac @@ -150,7 +150,7 @@ AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" != "no") - + GTK_DOC_CHECK(1.1) AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.18]) +AM_GNU_GETTEXT_VERSION([0.19]) - + AC_C_BIGENDIAN - --- + +-- 2.1.0 + |