diff options
Diffstat (limited to 'meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch')
| -rw-r--r-- | meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch b/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch index b8f0d727ab..5e452c52e7 100644 --- a/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch +++ b/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch @@ -1,3 +1,8 @@ +From ae3370788ed3447bba16969d9eb1bf1b9631e1b7 Mon Sep 17 00:00:00 2001 +From: Valentin Popa <valentin.popa@intel.com> +Date: Fri, 25 Apr 2014 13:58:55 +0300 +Subject: [PATCH] Correct rpl_gettimeofday signature + Currently we fail on uclibc like below | In file included from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/procfs.h:32:0, @@ -14,7 +19,6 @@ Currently we fail on uclibc like below | make[4]: *** [ex-cxx.o] Error 1 | make[4]: *** Waiting for unfinished jobs.... - GCC detects that we call 'restrict' as param name in function signatures and complains since both params are called 'restrict' therefore we use __restrict to denote the C99 keywork @@ -25,14 +29,17 @@ eglibc otherwise we will have same issue there too Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending +--- + gl/sys_time.in.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) -Index: gnutls-2.12.14/gl/sys_time.in.h -=================================================================== ---- gnutls-2.12.14.orig/gl/sys_time.in.h 2012-01-15 10:54:39.517285351 -0800 -+++ gnutls-2.12.14/gl/sys_time.in.h 2012-01-15 10:59:23.773299108 -0800 -@@ -82,20 +82,20 @@ - # define gettimeofday rpl_gettimeofday - # endif +diff --git a/gl/sys_time.in.h b/gl/sys_time.in.h +index 84a17c9..6ceadc3 100644 +--- a/gl/sys_time.in.h ++++ b/gl/sys_time.in.h +@@ -93,20 +93,20 @@ struct timeval + # define gettimeofday rpl_gettimeofday + # endif _GL_FUNCDECL_RPL (gettimeofday, int, - (struct timeval *restrict, void *restrict) + (struct timeval *__restrict, void *__restrict) @@ -40,18 +47,21 @@ Index: gnutls-2.12.14/gl/sys_time.in.h _GL_CXXALIAS_RPL (gettimeofday, int, - (struct timeval *restrict, void *restrict)); + (struct timeval *__restrict, void *__restrict)); - # else - # if !@HAVE_GETTIMEOFDAY@ + # else + # if !@HAVE_GETTIMEOFDAY@ _GL_FUNCDECL_SYS (gettimeofday, int, - (struct timeval *restrict, void *restrict) + (struct timeval *__restrict, void *__restrict) _GL_ARG_NONNULL ((1))); - # endif + # endif /* Need to cast, because on glibc systems, by default, the second argument is struct timezone *. */ _GL_CXXALIAS_SYS_CAST (gettimeofday, int, - (struct timeval *restrict, void *restrict)); + (struct timeval *__restrict, void *__restrict)); - # endif + # endif _GL_CXXALIASWARN (gettimeofday); - # elif defined GNULIB_POSIXCHECK + #elif defined GNULIB_POSIXCHECK +-- +1.9.1 + |