gnutls: Fix compilation on uclibc
Examples do not compile correctly on latest uclibc (From OE-Core rev: c0cd44bb5588e96b00631de1f1f8a8143b338c02) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
6455292b96
commit
b19b27676e
|
@ -0,0 +1,57 @@
|
|||
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,
|
||||
| from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/ucontext.h:26,
|
||||
| from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/signal.h:392,
|
||||
| from ../../gl/signal.h:52,
|
||||
| from ../../gl/sys/select.h:58,
|
||||
| from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/types.h:220,
|
||||
| from ../../gl/sys/types.h:28,
|
||||
| from ../../lib/includes/gnutls/gnutls.h:46,
|
||||
| from ex-cxx.cpp:3:
|
||||
| ../../gl/sys/time.h:396:66: error: conflicting declaration 'void* restrict'
|
||||
| ../../gl/sys/time.h:396:50: error: 'restrict' has a previous declaration as 'timeval* restrict'
|
||||
| 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
|
||||
|
||||
This only happens of uclibc since this code is not excercised with
|
||||
eglibc otherwise we will have same issue there too
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
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
|
||||
_GL_FUNCDECL_RPL (gettimeofday, int,
|
||||
- (struct timeval *restrict, void *restrict)
|
||||
+ (struct timeval *__restrict, void *__restrict)
|
||||
_GL_ARG_NONNULL ((1)));
|
||||
_GL_CXXALIAS_RPL (gettimeofday, int,
|
||||
- (struct timeval *restrict, void *restrict));
|
||||
+ (struct timeval *__restrict, void *__restrict));
|
||||
# else
|
||||
# if !@HAVE_GETTIMEOFDAY@
|
||||
_GL_FUNCDECL_SYS (gettimeofday, int,
|
||||
- (struct timeval *restrict, void *restrict)
|
||||
+ (struct timeval *__restrict, void *__restrict)
|
||||
_GL_ARG_NONNULL ((1)));
|
||||
# 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
|
||||
_GL_CXXALIASWARN (gettimeofday);
|
||||
# elif defined GNULIB_POSIXCHECK
|
|
@ -1,9 +1,11 @@
|
|||
require gnutls.inc
|
||||
|
||||
PR = "${INC_PR}.4"
|
||||
PR = "${INC_PR}.5"
|
||||
|
||||
SRC_URI += "file://gnutls-openssl.patch \
|
||||
file://configure-fix.patch"
|
||||
file://correct_rpl_gettimeofday_signature.patch \
|
||||
file://configure-fix.patch \
|
||||
"
|
||||
|
||||
python() {
|
||||
if not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1):
|
||||
|
|
Loading…
Reference in New Issue