NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/diffutils: fix build on microblazeel

Browse Source 
Fix the following build failure raised since bump to version 3.8 in
commit 1f89c80417:

sigsegv.c: In function 'sigsegv_handler':
sigsegv.c:979:28: error: 'struct vma_struct' has no member named 'is_near_this'
  979 |                       : vma.is_near_this (addr, &vma))
      |                            ^

Fixes:
 - http://autobuild.buildroot.org/results/5ecd55b7c72f9630a7acc72341ccb60e94ddb574

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2021-11-11 10:00:31 +01:00 committed by Thomas Petazzoni
parent 4074fbd0aa
commit 9dfe03df0d
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
package/diffutils/0001-m4-stack-direction.m4-fix-build-on-microblazeel.patch Normal file
View File

@ -0,0 +1,39 @@
From 7fd9de7f12718db0ace575c15c3a0e061ef6c542 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Thu, 11 Nov 2021 09:46:41 +0100
Subject: [PATCH] m4/stack-direction.m4: fix build on microblazeel
Fix the following build failure on microblazeel with diffutils raised
since version 3.8 and
https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=e54aa6196947ed22ff66bcd714e4fc7bd0c5c3b4
sigsegv.c: In function 'sigsegv_handler':
sigsegv.c:979:28: error: 'struct vma_struct' has no member named 'is_near_this'
979 | : vma.is_near_this (addr, &vma))
| ^
Fixes:
- http://autobuild.buildroot.org/results/5ecd55b7c72f9630a7acc72341ccb60e94ddb574
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: sent to bug-gnulib@gnu.org]
---
m4/stack-direction.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
index c90d69733..70286c8f5 100644
--- a/m4/stack-direction.m4
+++ b/m4/stack-direction.m4
@@ -37,7 +37,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
m68* | \
m88k | \
mcore | \
- microblaze | \
+ microblaze* | \
mips* | \
mmix | \
mn10200 | \
--
2.33.0

2
package/diffutils/diffutils.mk
View File

@ -10,6 +10,8 @@ DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils
DIFFUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
DIFFUTILS_LICENSE = GPL-3.0+
DIFFUTILS_LICENSE_FILES = COPYING
# We're patching m4/stack-direction.m4
DIFFUTILS_AUTORECONF = YES
# Since glibc >= 2.26, don't try to use getopt_long replacement bundled
# with diffutils. It will conflict with the one from glibc.