diff options
author | Valentin Popa <valentin.popa@intel.com> | 2014-04-28 17:27:29 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-06 17:59:16 +0100 |
commit | 37610cc401de8ef9da7349a8915f73c5e8efd9f2 (patch) | |
tree | df8734f9a0363201bc933994c5cdc5bdfb1a0312 /meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch | |
parent | 220c7e091de413da8846e0b4dd8e1ccc03de77bc (diff) | |
download | poky-37610cc401de8ef9da7349a8915f73c5e8efd9f2.tar.gz |
gnutls: update to 3.2.13
Removes not needed or already merged patches.
Removes unused configure flags.
Tells gnutls to use the included libopts.
Removes libextra (not needed since 3.0.5).
(From OE-Core rev: 4e360033579b9501449798b2d118f786816a557f)
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 @@ | |||
1 | From ae3370788ed3447bba16969d9eb1bf1b9631e1b7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Valentin Popa <valentin.popa@intel.com> | ||
3 | Date: Fri, 25 Apr 2014 13:58:55 +0300 | ||
4 | Subject: [PATCH] Correct rpl_gettimeofday signature | ||
5 | |||
1 | Currently we fail on uclibc like below | 6 | Currently we fail on uclibc like below |
2 | 7 | ||
3 | | In file included from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/procfs.h:32:0, | 8 | | 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 | |||
14 | | make[4]: *** [ex-cxx.o] Error 1 | 19 | | make[4]: *** [ex-cxx.o] Error 1 |
15 | | make[4]: *** Waiting for unfinished jobs.... | 20 | | make[4]: *** Waiting for unfinished jobs.... |
16 | 21 | ||
17 | |||
18 | GCC detects that we call 'restrict' as param name in function | 22 | GCC detects that we call 'restrict' as param name in function |
19 | signatures and complains since both params are called 'restrict' | 23 | signatures and complains since both params are called 'restrict' |
20 | therefore we use __restrict to denote the C99 keywork | 24 | therefore we use __restrict to denote the C99 keywork |
@@ -25,14 +29,17 @@ eglibc otherwise we will have same issue there too | |||
25 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 29 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
26 | 30 | ||
27 | Upstream-Status: Pending | 31 | Upstream-Status: Pending |
32 | --- | ||
33 | gl/sys_time.in.h | 8 ++++---- | ||
34 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
28 | 35 | ||
29 | Index: gnutls-2.12.14/gl/sys_time.in.h | 36 | diff --git a/gl/sys_time.in.h b/gl/sys_time.in.h |
30 | =================================================================== | 37 | index 84a17c9..6ceadc3 100644 |
31 | --- gnutls-2.12.14.orig/gl/sys_time.in.h 2012-01-15 10:54:39.517285351 -0800 | 38 | --- a/gl/sys_time.in.h |
32 | +++ gnutls-2.12.14/gl/sys_time.in.h 2012-01-15 10:59:23.773299108 -0800 | 39 | +++ b/gl/sys_time.in.h |
33 | @@ -82,20 +82,20 @@ | 40 | @@ -93,20 +93,20 @@ struct timeval |
34 | # define gettimeofday rpl_gettimeofday | 41 | # define gettimeofday rpl_gettimeofday |
35 | # endif | 42 | # endif |
36 | _GL_FUNCDECL_RPL (gettimeofday, int, | 43 | _GL_FUNCDECL_RPL (gettimeofday, int, |
37 | - (struct timeval *restrict, void *restrict) | 44 | - (struct timeval *restrict, void *restrict) |
38 | + (struct timeval *__restrict, void *__restrict) | 45 | + (struct timeval *__restrict, void *__restrict) |
@@ -40,18 +47,21 @@ Index: gnutls-2.12.14/gl/sys_time.in.h | |||
40 | _GL_CXXALIAS_RPL (gettimeofday, int, | 47 | _GL_CXXALIAS_RPL (gettimeofday, int, |
41 | - (struct timeval *restrict, void *restrict)); | 48 | - (struct timeval *restrict, void *restrict)); |
42 | + (struct timeval *__restrict, void *__restrict)); | 49 | + (struct timeval *__restrict, void *__restrict)); |
43 | # else | 50 | # else |
44 | # if !@HAVE_GETTIMEOFDAY@ | 51 | # if !@HAVE_GETTIMEOFDAY@ |
45 | _GL_FUNCDECL_SYS (gettimeofday, int, | 52 | _GL_FUNCDECL_SYS (gettimeofday, int, |
46 | - (struct timeval *restrict, void *restrict) | 53 | - (struct timeval *restrict, void *restrict) |
47 | + (struct timeval *__restrict, void *__restrict) | 54 | + (struct timeval *__restrict, void *__restrict) |
48 | _GL_ARG_NONNULL ((1))); | 55 | _GL_ARG_NONNULL ((1))); |
49 | # endif | 56 | # endif |
50 | /* Need to cast, because on glibc systems, by default, the second argument is | 57 | /* Need to cast, because on glibc systems, by default, the second argument is |
51 | struct timezone *. */ | 58 | struct timezone *. */ |
52 | _GL_CXXALIAS_SYS_CAST (gettimeofday, int, | 59 | _GL_CXXALIAS_SYS_CAST (gettimeofday, int, |
53 | - (struct timeval *restrict, void *restrict)); | 60 | - (struct timeval *restrict, void *restrict)); |
54 | + (struct timeval *__restrict, void *__restrict)); | 61 | + (struct timeval *__restrict, void *__restrict)); |
55 | # endif | 62 | # endif |
56 | _GL_CXXALIASWARN (gettimeofday); | 63 | _GL_CXXALIASWARN (gettimeofday); |
57 | # elif defined GNULIB_POSIXCHECK | 64 | #elif defined GNULIB_POSIXCHECK |
65 | -- | ||
66 | 1.9.1 | ||
67 | |||