diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2017-07-24 17:51:09 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-27 22:20:16 +0100 |
| commit | 0c09f9f5700696670b2a9d0466124309100eb296 (patch) | |
| tree | 018f395ee20c6ad1401dc5cda799654e3c73d252 /meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch | |
| parent | d1e05e9cbddea40ff582fae4ec7e2e7a4f52fd8f (diff) | |
| download | openembedded-core-contrib-0c09f9f5700696670b2a9d0466124309100eb296.tar.gz | |
diffutils: upgrade to 3.6
diffutils-3.5-gcc7.patch is removed as it's merged in this version.
do_configure_prepend is removed to solve the following configure error.
error: possibly undefined macro: gl_TYPE_WINT_T_PREREQ
A workaround patch is made to fix the following compilation error for glibc.
error: dereferencing pointer to incomplete type 'const struct rpl_option'
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch')
| -rw-r--r-- | meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch b/meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch new file mode 100644 index 0000000000..351f87cab5 --- /dev/null +++ b/meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch @@ -0,0 +1,30 @@ +Subject: explicitly disable replacing getopt + +Explicitly disable replacing getopt to avoid compilation error like below. + + xstrtol-error.c:84:26: error: invalid use of undefined type 'struct rpl_option' + +Upstream-Status: Inappropriate [workaround] +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + m4/getopt.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/m4/getopt.m4 b/m4/getopt.m4 +index 3ebc7b7..8934426 100644 +--- a/m4/getopt.m4 ++++ b/m4/getopt.m4 +@@ -22,8 +22,8 @@ AC_DEFUN([gl_FUNC_GETOPT_POSIX], + fi + ]) + if test $REPLACE_GETOPT = 1; then +- dnl Arrange for getopt.h to be created. +- gl_GETOPT_SUBSTITUTE_HEADER ++ dnl Explicitly disable replacing getopt ++ : + fi + ]) + +-- +2.11.0 + |