Patchwork [dylan] elfutils-native: Update the patch to include the missing pieces needed for tests

login
register
mail settings
Submitter Khem Raj
Date Oct. 30, 2013, 4:42 a.m.
Message ID <1383108159-18756-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/60747/
State Accepted
Commit cb966afe86a5856d846fb0d4fb627cdce2ae0670
Headers show

Comments

Khem Raj - Oct. 30, 2013, 4:42 a.m.
In the last patch we missed similar update for test/line2addr.c
which meant that the build still failed.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../elfutils/elfutils/fix-build-gcc-4.8.patch       | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

Patch

diff --git a/meta/recipes-devtools/elfutils/elfutils/fix-build-gcc-4.8.patch b/meta/recipes-devtools/elfutils/elfutils/fix-build-gcc-4.8.patch
index a7c3519..0e28690 100644
--- a/meta/recipes-devtools/elfutils/elfutils/fix-build-gcc-4.8.patch
+++ b/meta/recipes-devtools/elfutils/elfutils/fix-build-gcc-4.8.patch
@@ -25,11 +25,11 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 Upstream-Status: Inappropriate [Caused by an earlier patch]
 
-Index: elfutils-0.155/src/addr2line.c
+Index: elfutils-0.148/src/addr2line.c
 ===================================================================
---- elfutils-0.155.orig/src/addr2line.c
-+++ elfutils-0.155/src/addr2line.c
-@@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl
+--- elfutils-0.148.orig/src/addr2line.c	2013-09-23 17:46:45.513586538 -0700
++++ elfutils-0.148/src/addr2line.c	2013-09-23 17:46:46.329586558 -0700
+@@ -447,10 +447,10 @@
        bool parsed = false;
        int i, j;
        char *name = NULL;
@@ -42,3 +42,16 @@  Index: elfutils-0.155/src/addr2line.c
  	{
  	default:
  	  break;
+Index: elfutils-0.148/tests/line2addr.c
+===================================================================
+--- elfutils-0.148.orig/tests/line2addr.c	2013-09-23 17:46:45.521586538 -0700
++++ elfutils-0.148/tests/line2addr.c	2013-09-23 17:46:46.329586558 -0700
+@@ -132,7 +132,7 @@
+     {
+       struct args a = { .arg = argv[cnt] };
+ 
+-      switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line))
++      switch (sscanf (a.arg, "%m[^:]:%d", &a.file, &a.line))
+ 	{
+ 	default:
+ 	case 0: