diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2019-02-19 09:53:13 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-20 21:22:49 +0000 |
commit | 31836257c4c4e499eb3256ae3a30ed532aca7abc (patch) | |
tree | 2f7301e8b755c7d8b77517ba235c3e21837a568e /meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch | |
parent | a17abae00785c76cfffe5381a22fb2c86b982e82 (diff) | |
download | poky-31836257c4c4e499eb3256ae3a30ed532aca7abc.tar.gz |
diffutils: upgrade to 3.7
The following two patches are removed as they are not needed anymore.
0001-Unset-need_charset_alias-when-building-for-musl.patch
0001-explicitly-disable-replacing-getopt.patch
(From OE-Core rev: cc8c9b36258d0bb1635b2d4644d7fc64357c5110)
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, 0 insertions, 30 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 deleted file mode 100644 index 351f87cab5..0000000000 --- a/meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
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 | |||