diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-06-22 22:58:58 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-25 16:35:54 +0100 |
commit | 953d7e212603dc50bba151ceec875c2dffc6148e (patch) | |
tree | 4d5c0e96848cb5e35fd88f4edea8228bfd2bc6e6 /meta/recipes-core/util-linux/util-linux | |
parent | e86032f32f383bee95289762eff683e862567383 (diff) | |
download | poky-953d7e212603dc50bba151ceec875c2dffc6148e.tar.gz |
util-linux: Update to 2.21.2
Remove patch that was corrected upstream
(From OE-Core rev: 6cbcee1a7fe52437e58045d4acd169ea214b6cb3)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/meta/recipes-core/util-linux/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch b/meta/recipes-core/util-linux/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch deleted file mode 100644 index 545c3a9c7b..0000000000 --- a/meta/recipes-core/util-linux/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | configure uses AC_CHECK_DECLS to check for _NL_TIME_WEEK_1STDAY | ||
2 | which means we will get HAVE_DECL__NL_TIME_WEEK_1STDAY | ||
3 | defined to 1 if symbol is declared, otherwise to 0 in config.h | ||
4 | |||
5 | Therefore we cannot rely on conditionals which check for it | ||
6 | being defined or not since it always will be defined so correct | ||
7 | thing is to use #if instead of #ifdef | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Index: util-linux-2.21/misc-utils/cal.c | ||
13 | =================================================================== | ||
14 | --- util-linux-2.21.orig/misc-utils/cal.c 2012-02-29 23:41:54.413347665 -0800 | ||
15 | +++ util-linux-2.21/misc-utils/cal.c 2012-02-29 23:42:44.573350057 -0800 | ||
16 | @@ -297,7 +297,7 @@ | ||
17 | * the locale database, which can be overridden with the | ||
18 | * -s (Sunday) or -m (Monday) options. | ||
19 | */ | ||
20 | -#ifdef HAVE_DECL__NL_TIME_WEEK_1STDAY | ||
21 | +#if HAVE_DECL__NL_TIME_WEEK_1STDAY | ||
22 | /* | ||
23 | * You need to use 2 locale variables to get the first day of the week. | ||
24 | * This is needed to support first_weekday=2 and first_workday=1 for | ||