mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-04 16:10:04 +00:00
diffutils: Add patch to fix gplv2 version with gcc6
(From OE-Core rev: 9c21339306a5e77ffd256f0a2b1759131109cb64) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
239efcccca
commit
4c3738c149
|
|
@ -0,0 +1,31 @@
|
|||
Fixes to allow diffutils to build with gcc v6.
|
||||
|
||||
RP
|
||||
2016/5/25
|
||||
|
||||
Index: diffutils-2.8.1/lib/posix/regex.h
|
||||
===================================================================
|
||||
--- diffutils-2.8.1.orig/lib/posix/regex.h
|
||||
+++ diffutils-2.8.1/lib/posix/regex.h
|
||||
@@ -529,7 +529,9 @@ extern int re_exec _RE_ARGS ((const char
|
||||
/* For now unconditionally define __restrict_arr to expand to nothing.
|
||||
Ideally we would have a test for the compiler which allows defining
|
||||
it to restrict. */
|
||||
+#ifndef __restrict_arr
|
||||
#define __restrict_arr
|
||||
+#endif
|
||||
|
||||
/* POSIX compatibility. */
|
||||
extern int regcomp _RE_ARGS ((regex_t *__restrict __preg,
|
||||
Index: diffutils-2.8.1/src/diff.c
|
||||
===================================================================
|
||||
--- diffutils-2.8.1.orig/src/diff.c
|
||||
+++ diffutils-2.8.1/src/diff.c
|
||||
@@ -71,6 +71,7 @@ static void usage (void);
|
||||
static bool recursive;
|
||||
|
||||
/* In context diffs, show previous lines that match these regexps. */
|
||||
+struct re_pattern_buffer function_regexp;
|
||||
static struct regexp_list function_regexp_list;
|
||||
|
||||
/* Ignore changes affecting only lines that match these regexps. */
|
||||
|
|
@ -6,7 +6,8 @@ require diffutils.inc
|
|||
PR = "r7.0"
|
||||
|
||||
SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz \
|
||||
file://diffutils_fix_for_automake-1.12.patch"
|
||||
file://diffutils_fix_for_automake-1.12.patch \
|
||||
file://fix_gcc6.patch"
|
||||
|
||||
SRC_URI[md5sum] = "71f9c5ae19b60608f6c7f162da86a428"
|
||||
SRC_URI[sha256sum] = "c5001748b069224dd98bf1bb9ee877321c7de8b332c8aad5af3e2a7372d23f5a"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user