From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com ([143.182.124.21]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1Rnx30-0004iq-9F for openembedded-core@lists.openembedded.org; Thu, 19 Jan 2012 19:49:18 +0100 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga101.ch.intel.com with ESMTP; 19 Jan 2012 10:40:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="58095471" Received: from unknown (HELO [10.255.14.6]) ([10.255.14.6]) by AZSMGA002.ch.intel.com with ESMTP; 19 Jan 2012 10:40:47 -0800 Message-ID: <4F1863AF.4000406@linux.intel.com> Date: Thu, 19 Jan 2012 10:40:47 -0800 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:8.0) Gecko/20111115 Thunderbird/8.0 MIME-Version: 1.0 To: Patches and discussions about the oe-core layer References: <1326819016-7111-1-git-send-email-raj.khem@gmail.com> In-Reply-To: <1326819016-7111-1-git-send-email-raj.khem@gmail.com> Subject: Re: [PATCH 1/2] gnutls: Fix compilation on uclibc X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jan 2012 18:49:18 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 01/17/2012 08:50 AM, Khem Raj wrote: > Examples do not compile correctly on latest uclibc > > Signed-off-by: Khem Raj > --- > .../correct_rpl_gettimeofday_signature.patch | 57 ++++++++++++++++++++ > meta/recipes-support/gnutls/gnutls_2.12.14.bb | 6 ++- > 2 files changed, 61 insertions(+), 2 deletions(-) > create mode 100644 meta/recipes-support/gnutls/gnutls-2.12.14/correct_rpl_gettimeofday_signature.patch > > diff --git a/meta/recipes-support/gnutls/gnutls-2.12.14/correct_rpl_gettimeofday_signature.patch b/meta/recipes-support/gnutls/gnutls-2.12.14/correct_rpl_gettimeofday_signature.patch > new file mode 100644 > index 0000000..b8f0d72 > --- /dev/null > +++ b/meta/recipes-support/gnutls/gnutls-2.12.14/correct_rpl_gettimeofday_signature.patch > @@ -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 > + > +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 > diff --git a/meta/recipes-support/gnutls/gnutls_2.12.14.bb b/meta/recipes-support/gnutls/gnutls_2.12.14.bb > index 21fd187..6a50cec 100644 > --- a/meta/recipes-support/gnutls/gnutls_2.12.14.bb > +++ b/meta/recipes-support/gnutls/gnutls_2.12.14.bb > @@ -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): Merged into OE-Core Thanks Sau!