From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail1.windriver.com (mail1.windriver.com [147.11.146.13]) by mail.openembedded.org (Postfix) with ESMTP id CB5FF6C738 for ; Wed, 27 Nov 2013 08:15:18 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.14.5/8.14.5) with ESMTP id rAR8FIqD007699 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL) for ; Wed, 27 Nov 2013 00:15:18 -0800 (PST) Received: from [128.224.162.168] (128.224.162.168) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.2.347.0; Wed, 27 Nov 2013 00:15:17 -0800 Message-ID: <5295AA14.6080105@windriver.com> Date: Wed, 27 Nov 2013 16:15:16 +0800 From: Rongqing Li User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130623 Thunderbird/17.0.7 MIME-Version: 1.0 To: , References: <1385004460-3166-1-git-send-email-rongqing.li@windriver.com> In-Reply-To: <1385004460-3166-1-git-send-email-rongqing.li@windriver.com> Subject: Re: [PATCH] quagga: Backport a patch to fix extract.pl for cross compilation X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Nov 2013 08:15:19 -0000 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Hi Joe: Welcome you back oe-devel, This patch needs to merge too. Thanks -Roy On 11/21/2013 11:27 AM, rongqing.li@windriver.com wrote: > From: Roy Li > > Signed-off-by: Roy Li > --- > ...uild-fix-extract.pl-for-cross-compilation.patch | 31 ++++++++++++++++++++ > .../recipes-protocols/quagga/quagga_0.99.21.bb | 4 ++- > 2 files changed, 34 insertions(+), 1 deletion(-) > create mode 100644 meta-networking/recipes-protocols/quagga/files/build-fix-extract.pl-for-cross-compilation.patch > > diff --git a/meta-networking/recipes-protocols/quagga/files/build-fix-extract.pl-for-cross-compilation.patch b/meta-networking/recipes-protocols/quagga/files/build-fix-extract.pl-for-cross-compilation.patch > new file mode 100644 > index 0000000..e3ccc2a > --- /dev/null > +++ b/meta-networking/recipes-protocols/quagga/files/build-fix-extract.pl-for-cross-compilation.patch > @@ -0,0 +1,31 @@ > +Upstream-Status: Backport > + > +From ed6e297972318a0070ad4d973401fbc6e0def558 Mon Sep 17 00:00:00 2001 > +From: Serj Kalichev > +Date: Fri, 7 Sep 2012 13:29:42 +0400 > +Subject: [PATCH] build: fix extract.pl for cross compilation > + > +extract.pl should invoke the C preprocessor for the target system, not the > +host. > + > +* vtysh/extract.pl.in: use @CPP@ to get target cpp > +--- > + vtysh/extract.pl.in | 2 +- > + 1 files changed, 1 insertions(+), 1 deletions(-) > + > +diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in > +index 7612aff..4c3a47f 100755 > +--- a/vtysh/extract.pl.in > ++++ b/vtysh/extract.pl.in > +@@ -63,7 +63,7 @@ $ignore{'"show history"'} = "ignore"; > + foreach (@ARGV) { > + $file = $_; > + > +- open (FH, "cpp -DHAVE_CONFIG_H -DVTYSH_EXTRACT_PL -DHAVE_IPV6 -I@top_builddir@ -I@srcdir@/ -I@srcdir@/.. -I@top_srcdir@/lib -I@top_srcdir@/isisd/topology @SNMP_INCLUDES@ @CPPFLAGS@ $file |"); > ++ open (FH, "@cpp@ -DHAVE_CONFIG_H -DVTYSH_EXTRACT_PL -DHAVE_IPV6 -I@top_builddir@ -I@srcdir@/ -I@srcdir@/.. -I@top_srcdir@/lib -I@top_srcdir@/isisd/topology @SNMP_INCLUDES@ @CPPFLAGS@ $file |"); > + local $/; undef $/; > + $line = ; > + close (FH); > +-- > +1.7.1 > + > diff --git a/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb b/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb > index 10740bc..ae93952 100644 > --- a/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb > +++ b/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb > @@ -3,7 +3,9 @@ require quagga.inc > PR = "${INC_PR}.0" > > SRC_URI += "file://0001-doc-fix-makeinfo-errors-and-one-warning.patch \ > - file://lingering-IP-address-after-deletion-BZ-486.patch" > + file://lingering-IP-address-after-deletion-BZ-486.patch \ > + file://build-fix-extract.pl-for-cross-compilation.patch \ > +" > > SRC_URI[quagga-0.99.21.md5sum] = "99840adbe57047c90dfba6b6ed9aec7f" > SRC_URI[quagga-0.99.21.sha256sum] = "9b8aea9026b4771a28e254a66cbd854723bcd0d71eebd0201d11838d4eb392ee" > -- Best Reagrds, Roy | RongQing Li