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:36:53 +0100 |
commit | dba27e245e37eb1ffb0c086a0d709deda29eee12 (patch) | |
tree | 2e39c4d0f0be6c93f022bcb93a26c5c4602388dc /meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch | |
parent | e1e723db1dd085ca3baa22aa5811f3d90d00de13 (diff) | |
download | poky-dba27e245e37eb1ffb0c086a0d709deda29eee12.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'
(From OE-Core rev: 0c09f9f5700696670b2a9d0466124309100eb296)
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 @@ | |||
1 | Subject: explicitly disable replacing getopt | ||
2 | |||
3 | Explicitly disable replacing getopt to avoid compilation error like below. | ||
4 | |||
5 | xstrtol-error.c:84:26: error: invalid use of undefined type 'struct rpl_option' | ||
6 | |||
7 | Upstream-Status: Inappropriate [workaround] | ||
8 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
9 | --- | ||
10 | m4/getopt.m4 | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/m4/getopt.m4 b/m4/getopt.m4 | ||
14 | index 3ebc7b7..8934426 100644 | ||
15 | --- a/m4/getopt.m4 | ||
16 | +++ b/m4/getopt.m4 | ||
17 | @@ -22,8 +22,8 @@ AC_DEFUN([gl_FUNC_GETOPT_POSIX], | ||
18 | fi | ||
19 | ]) | ||
20 | if test $REPLACE_GETOPT = 1; then | ||
21 | - dnl Arrange for getopt.h to be created. | ||
22 | - gl_GETOPT_SUBSTITUTE_HEADER | ||
23 | + dnl Explicitly disable replacing getopt | ||
24 | + : | ||
25 | fi | ||
26 | ]) | ||
27 | |||
28 | -- | ||
29 | 2.11.0 | ||
30 | |||