diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended/diffutils')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-2.8.1/diffutils_fix_for_automake-1.12.patch | 2 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-2.8.1/fix_gcc6.patch | 31 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.4/0001-Unset-need_charset_alias-when-building-for-musl.patch (renamed from import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.3/0001-Unset-need_charset_alias-when-building-for-musl.patch) | 0 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.4/run-ptest (renamed from import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.3/run-ptest) | 0 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils_2.8.1.bb | 3 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils_3.4.bb (renamed from import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils_3.3.bb) | 4 |
6 files changed, 36 insertions, 4 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-2.8.1/diffutils_fix_for_automake-1.12.patch b/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-2.8.1/diffutils_fix_for_automake-1.12.patch index cc05d1dc0..f8638bbff 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-2.8.1/diffutils_fix_for_automake-1.12.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-2.8.1/diffutils_fix_for_automake-1.12.patch @@ -10,7 +10,7 @@ this patch avoids these kinds of errors: | configure.ac:90: the top level | autom4te: m4 failed with exit status: 1 -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> +Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2012/05/04 Index: diffutils-2.8.1/m4/prereq.m4 diff --git a/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-2.8.1/fix_gcc6.patch b/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-2.8.1/fix_gcc6.patch new file mode 100644 index 000000000..f915287fe --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-2.8.1/fix_gcc6.patch @@ -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. */ diff --git a/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.3/0001-Unset-need_charset_alias-when-building-for-musl.patch b/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.4/0001-Unset-need_charset_alias-when-building-for-musl.patch index ba1a4bab4..ba1a4bab4 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.3/0001-Unset-need_charset_alias-when-building-for-musl.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.4/0001-Unset-need_charset_alias-when-building-for-musl.patch diff --git a/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.3/run-ptest b/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.4/run-ptest index 695c5e8a7..695c5e8a7 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.3/run-ptest +++ b/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.4/run-ptest diff --git a/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils_2.8.1.bb b/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils_2.8.1.bb index bf425bbb3..fe56f9ce5 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils_2.8.1.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils_2.8.1.bb @@ -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" diff --git a/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils_3.3.bb b/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils_3.4.bb index 5008690ea..cb7092b51 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils_3.3.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils_3.4.bb @@ -17,8 +17,8 @@ do_configure_prepend () { done } -SRC_URI[md5sum] = "99180208ec2a82ce71f55b0d7389f1b3" -SRC_URI[sha256sum] = "a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c" +SRC_URI[md5sum] = "df9ca465f30307cffd03da176a43a5d4" +SRC_URI[sha256sum] = "db53c025f2ac3d217bcf753dad6dee7b410b33d0948495ff015aaf8b91189ce2" inherit ptest |