summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnutls
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-15 23:15:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-22 09:16:00 +0100
commit4c2d0b1205be2c0e42cafea1de18e46edf4a374b (patch)
tree929918f4745764c3b5618f1489e540cf0645eeb4 /meta/recipes-support/gnutls
parent39df3561d8cb0d6d86d492bb462640cf2f0a760a (diff)
downloadpoky-4c2d0b1205be2c0e42cafea1de18e46edf4a374b.tar.gz
meta: Remove further uclibc remnants (inc. patches and site files)
Some of these are clearly dead, e.g. one binutils patch reverts the effects of the earlier one. This also removes the uclibc site files. We now have mechanisms to allow these to be extended from another layer should someone ever wish to do that. (From OE-Core rev: e01e7c543a559c8926d72159b5cd55db0c661434) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnutls')
-rw-r--r--meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch68
-rw-r--r--meta/recipes-support/gnutls/gnutls_3.5.13.bb3
2 files changed, 1 insertions, 70 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
deleted file mode 100644
index 96b023a468..0000000000
--- a/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1From 81b0f04c14f673b99778d2e7d8e85461e0bf2018 Mon Sep 17 00:00:00 2001
2From: Valentin Popa <valentin.popa@intel.com>
3Date: Fri, 25 Apr 2014 13:58:55 +0300
4Subject: [PATCH 1/3] Correct rpl_gettimeofday signature
5
6Currently we fail on uclibc like below
7
8| In file included from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/procfs.h:32:0,
9| from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/ucontext.h:26,
10| from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/signal.h:392,
11| from ../../gl/signal.h:52,
12| from ../../gl/sys/select.h:58,
13| from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/types.h:220,
14| from ../../gl/sys/types.h:28,
15| from ../../lib/includes/gnutls/gnutls.h:46,
16| from ex-cxx.cpp:3:
17| ../../gl/sys/time.h:396:66: error: conflicting declaration 'void* restrict'
18| ../../gl/sys/time.h:396:50: error: 'restrict' has a previous declaration as 'timeval* restrict'
19| make[4]: *** [ex-cxx.o] Error 1
20| make[4]: *** Waiting for unfinished jobs....
21
22GCC detects that we call 'restrict' as param name in function
23signatures and complains since both params are called 'restrict'
24therefore we use __restrict to denote the C99 keywork
25
26This only happens of uclibc since this code is not excercised with
27eglibc otherwise we will have same issue there too
28
29Signed-off-by: Khem Raj <raj.khem@gmail.com>
30
31Upstream-Status: Pending
32
33---
34 gl/sys_time.in.h | 8 ++++----
35 1 file changed, 4 insertions(+), 4 deletions(-)
36
37diff --git a/gl/sys_time.in.h b/gl/sys_time.in.h
38index 5a8caf3..2dc5718 100644
39--- a/gl/sys_time.in.h
40+++ b/gl/sys_time.in.h
41@@ -93,20 +93,20 @@ struct timeval
42 # define gettimeofday rpl_gettimeofday
43 # endif
44 _GL_FUNCDECL_RPL (gettimeofday, int,
45- (struct timeval *restrict, void *restrict)
46+ (struct timeval *__restrict, void *__restrict)
47 _GL_ARG_NONNULL ((1)));
48 _GL_CXXALIAS_RPL (gettimeofday, int,
49- (struct timeval *restrict, void *restrict));
50+ (struct timeval *__restrict, void *__restrict));
51 # else
52 # if !@HAVE_GETTIMEOFDAY@
53 _GL_FUNCDECL_SYS (gettimeofday, int,
54- (struct timeval *restrict, void *restrict)
55+ (struct timeval *__restrict, void *__restrict)
56 _GL_ARG_NONNULL ((1)));
57 # endif
58 /* Need to cast, because on glibc systems, by default, the second argument is
59 struct timezone *. */
60 _GL_CXXALIAS_SYS_CAST (gettimeofday, int,
61- (struct timeval *restrict, void *restrict));
62+ (struct timeval *__restrict, void *__restrict));
63 # endif
64 _GL_CXXALIASWARN (gettimeofday);
65 # if defined __cplusplus && defined GNULIB_NAMESPACE
66--
672.10.2
68
diff --git a/meta/recipes-support/gnutls/gnutls_3.5.13.bb b/meta/recipes-support/gnutls/gnutls_3.5.13.bb
index 11155007e5..35d7d09c83 100644
--- a/meta/recipes-support/gnutls/gnutls_3.5.13.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.5.13.bb
@@ -1,7 +1,6 @@
1require gnutls.inc 1require gnutls.inc
2 2
3SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ 3SRC_URI += "file://0001-configure.ac-fix-sed-command.patch \
4 file://0001-configure.ac-fix-sed-command.patch \
5 file://use-pkg-config-to-locate-zlib.patch \ 4 file://use-pkg-config-to-locate-zlib.patch \
6 file://arm_eabi.patch \ 5 file://arm_eabi.patch \
7 " 6 "