package/diffutils: bump version to 3.9
Drop now included patches and regenerate ignore file. http://savannah.gnu.org/forum/forum.php?forum_id=10282 Signed-off-by: Daniel Lang <dalang@gmx.at> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Daniel Lang
Yann E. MORIN
parent
3ab6053fee
commit
a43fb5e806
@ -351,11 +351,6 @@ package/dhrystone/0003-exit.patch Sob Upstream
|
||||
package/dhrystone/0004-headers.patch Sob Upstream
|
||||
package/dhrystone/0005-prototypes.patch Sob Upstream
|
||||
package/dht/0001-cmake.patch Upstream
|
||||
package/diffutils/0001-m4-stack-direction.m4-fix-build-on-microblazeel.patch Upstream
|
||||
package/diffutils/0002-sigsegv-fix-build-on-or1k.patch Upstream
|
||||
package/diffutils/0003-sys_random-port-better-to-uClibc-1-0-35.patch Upstream
|
||||
package/diffutils/0004-sigsegv-Fix-compilation-error-on-arceb-CPUs.patch Upstream
|
||||
package/diffutils/0005-sigsegv-Add-support-for-Linux-PowerPC-32-bit-with-mu.patch Upstream
|
||||
package/dillo/0001-usr-local-include.patch Upstream
|
||||
package/dillo/0002-Fix-openssl-detection.patch Upstream
|
||||
package/dillo/0004-fix-build-with-gcc-10.patch Upstream
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
From 496c1740e5475be85b65fdb2b143771f09ed27cb Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 11 Nov 2021 10:06:31 +0100
|
||||
Subject: sigsegv: fix build on or1k
|
||||
|
||||
Fix the following build failure on or1k with diffutils 3.8
|
||||
https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=e54aa6196947ed22ff66bcd714e4fc7bd0c5c3b4
|
||||
sigsegv.c:979:28: error: 'struct vma_struct' has no member named 'is_near_this'
|
||||
http://autobuild.buildroot.org/results/5427e52489d29ed4f18b4a70b3c36f0f7bb0ddd9
|
||||
|
||||
[Retrieved from:
|
||||
https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=496c1740e5475be85b65fdb2b143771f09ed27cb]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
m4/stack-direction.m4 | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
|
||||
index 70286c8f5..29e398d77 100644
|
||||
--- a/m4/stack-direction.m4
|
||||
+++ b/m4/stack-direction.m4
|
||||
@@ -45,6 +45,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
|
||||
nios2 | \
|
||||
nds32* | \
|
||||
ns32k | \
|
||||
+ or1k | \
|
||||
pdp11 | \
|
||||
pj* | \
|
||||
powerpc* | rs6000 | \
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From 135414a7f543e4d40ad0a7cbd51885e159a6e0f4 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Tue, 30 Nov 2021 17:50:01 -0800
|
||||
Subject: sys_random: port better to uClibc < 1.0.35
|
||||
|
||||
Problem reported by Fabrice Fontaine in:
|
||||
https://lists.gnu.org/r/bug-gnulib/2021-11/msg00043.html
|
||||
* lib/sys_random.in.h [HAVE_SYS_RANDOM_H && !__GLIBC__ && __UCLIBC__]:
|
||||
Include <stddef.h>, in case this file is included before
|
||||
__UCLIBC__ is defined.
|
||||
|
||||
[Retrieved (and backported to remove ChangeLog update) from:
|
||||
https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=135414a7f543e4d40ad0a7cbd51885e159a6e0f4]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
ChangeLog | 9 +++++++++
|
||||
lib/sys_random.in.h | 6 ++++--
|
||||
2 files changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/sys_random.in.h b/lib/sys_random.in.h
|
||||
index 1abd6c544..8b4b934a1 100644
|
||||
--- a/lib/sys_random.in.h
|
||||
+++ b/lib/sys_random.in.h
|
||||
@@ -23,8 +23,10 @@
|
||||
|
||||
#if @HAVE_SYS_RANDOM_H@
|
||||
|
||||
-/* On uClibc, <sys/random.h> assumes prior inclusion of <stddef.h>. */
|
||||
-# if defined __UCLIBC__
|
||||
+/* On uClibc < 1.0.35, <sys/random.h> assumes prior inclusion of <stddef.h>.
|
||||
+ Do not use __UCLIBC__ here, as it might not be defined yet.
|
||||
+ But avoid namespace pollution on glibc systems. */
|
||||
+# ifndef __GLIBC__
|
||||
# include <stddef.h>
|
||||
# endif
|
||||
/* On Mac OS X 10.5, <sys/random.h> assumes prior inclusion of <sys/types.h>.
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
From 1957bb5113a2bf02c7ecf0815125eec04b9476d2 Mon Sep 17 00:00:00 2001
|
||||
From: Bruno Haible <bruno@clisp.org>
|
||||
Date: Sat, 16 Apr 2022 03:01:51 +0200
|
||||
Subject: sigsegv: Fix compilation error on arceb CPUs.
|
||||
|
||||
Reported by Fabrice Fontaine <fontaine.fabrice@gmail.com> in
|
||||
<https://lists.gnu.org/archive/html/bug-gnulib/2022-04/msg00028.html>.
|
||||
|
||||
* m4/stack-direction.m4 (SV_STACK_DIRECTION): Treat the 'arc' variants
|
||||
like 'arc'.
|
||||
|
||||
[Retrieved (and backported) from:
|
||||
https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=1957bb5113a2bf02c7ecf0815125eec04b9476d2]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
ChangeLog | 8 ++++++++
|
||||
m4/stack-direction.m4 | 4 ++--
|
||||
2 files changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
|
||||
index 1df823e..924c5de 100644
|
||||
--- a/m4/stack-direction.m4
|
||||
+++ b/m4/stack-direction.m4
|
||||
@@ -1,4 +1,4 @@
|
||||
-# stack-direction.m4 serial 7
|
||||
+# stack-direction.m4 serial 11
|
||||
dnl Copyright (C) 2002-2021 Free Software Foundation, Inc.
|
||||
dnl This file is free software, distributed under the terms of the GNU
|
||||
dnl General Public License. As a special exception to the GNU General
|
||||
@@ -18,7 +18,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
|
||||
a29k | \
|
||||
aarch64* | \
|
||||
alpha* | \
|
||||
- arc | \
|
||||
+ arc | arceb | arc32 | arc64 | \
|
||||
arm* | strongarm* | xscale* | \
|
||||
avr | avr32 | \
|
||||
bfin | \
|
||||
--
|
||||
cgit v1.1
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
From 6f2f006185cdeeda997d19d651379bfc6887e394 Mon Sep 17 00:00:00 2001
|
||||
From: Joel Stanley <joel@jms.id.au>
|
||||
Date: Mon, 6 Jun 2022 17:14:12 +0930
|
||||
Subject: [PATCH] sigsegv: Add support for Linux/PowerPC (32-bit) with musl
|
||||
libc. Reported by Khem Raj <raj.khem@gmail.com> in
|
||||
<https://lists.gnu.org/archive/html/m4-patches/2022-03/msg00000.html>.
|
||||
|
||||
* src/sigsegv.c (SIGSEGV_FAULT_STACKPOINTER): In the Linux/PowerPC
|
||||
32-bit case, handle musl libc differently.
|
||||
* modules/sigsegv (Files): Add m4/musl.m4.
|
||||
(configure.ac): Invoke gl_MUSL_LIBC.
|
||||
|
||||
Backported from http://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=2d830e4a792fcd9f614ed08a7f18584b8b21d23b
|
||||
Signed-off-by: Joel Stanley <joel@jms.id.au>
|
||||
---
|
||||
lib/sigsegv.c | 25 +++++++++++++++++++++----
|
||||
1 file changed, 21 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/lib/sigsegv.c b/lib/sigsegv.c
|
||||
index da70ffa5fda1..da64d7d0b617 100644
|
||||
--- a/lib/sigsegv.c
|
||||
+++ b/lib/sigsegv.c
|
||||
@@ -227,11 +227,28 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
|
||||
# if defined __powerpc64__ || defined __powerpc64_elfv2__ /* 64-bit */
|
||||
# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1]
|
||||
# else /* 32-bit */
|
||||
-/* both should be equivalent */
|
||||
-# if 0
|
||||
-# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
|
||||
+# if MUSL_LIBC
|
||||
+/* musl libc has a different structure of ucontext_t in
|
||||
+ musl/arch/powerpc/bits/signal.h. */
|
||||
+/* The glibc comments say:
|
||||
+ "Different versions of the kernel have stored the registers on signal
|
||||
+ delivery at different offsets from the ucontext struct. Programs should
|
||||
+ thus use the uc_mcontext.uc_regs pointer to find where the registers are
|
||||
+ actually stored." */
|
||||
+# if 0
|
||||
+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1]
|
||||
+# else
|
||||
+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_regs->gregs[1]
|
||||
+# endif
|
||||
# else
|
||||
-# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
|
||||
+/* Assume the structure of ucontext_t in
|
||||
+ glibc/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h. */
|
||||
+/* Because of the union, both definitions should be equivalent. */
|
||||
+# if 0
|
||||
+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
|
||||
+# else
|
||||
+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
|
||||
+# endif
|
||||
# endif
|
||||
# endif
|
||||
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec diffutils-3.8.tar.xz
|
||||
sha256 d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1 diffutils-3.9.tar.xz
|
||||
# Locally calculated
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
|
||||
@ -4,14 +4,12 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DIFFUTILS_VERSION = 3.8
|
||||
DIFFUTILS_VERSION = 3.9
|
||||
DIFFUTILS_SOURCE = diffutils-$(DIFFUTILS_VERSION).tar.xz
|
||||
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.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user