Patchwork quagga: Backport a patch to fix extract.pl for cross compilation

login
register
mail settings
Submitter rongqing.li@windriver.com
Date Nov. 21, 2013, 3:27 a.m.
Message ID <1385004460-3166-1-git-send-email-rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/62061/
State Accepted, archived
Headers show

Comments

rongqing.li@windriver.com - Nov. 21, 2013, 3:27 a.m.
From: Roy Li <rongqing.li@windriver.com>

Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
 ...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
rongqing.li@windriver.com - Nov. 27, 2013, 8:15 a.m.
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 <rongqing.li@windriver.com>
>
> Signed-off-by: Roy Li <rongqing.li@windriver.com>
> ---
>   ...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 <serj.kalichev@gmail.com>
> +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 = <FH>;
> +     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"
>
Joe MacDonald - Nov. 27, 2013, 8:26 p.m.
[Re: [oe] [PATCH] quagga: Backport a patch to fix extract.pl for cross compilation] On 13.11.27 (Wed 16:15) Rongqing Li wrote:

> Hi Joe:
> 
> Welcome you back oe-devel, This patch needs to merge too.

I must've missed this when I was doing a scan of my mail backlog since
it wasn't tagged meta-networking.  There's a much higher miss-rate on
those.  :-)

Merged now.

-J.

> Thanks
> 
> -Roy
> 
> 
> 
> On 11/21/2013 11:27 AM, rongqing.li@windriver.com wrote:
> >From: Roy Li <rongqing.li@windriver.com>
> >
> >Signed-off-by: Roy Li <rongqing.li@windriver.com>
> >---
> >  ...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 <serj.kalichev@gmail.com>
> >+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 = <FH>;
> >+     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"
> >
>

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 <serj.kalichev@gmail.com>
+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 = <FH>;
+     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"