summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/util-linux/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch24
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.21.2.bb (renamed from meta/recipes-core/util-linux/util-linux_2.21.1.bb)7
2 files changed, 3 insertions, 28 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 @@
1configure uses AC_CHECK_DECLS to check for _NL_TIME_WEEK_1STDAY
2which means we will get HAVE_DECL__NL_TIME_WEEK_1STDAY
3defined to 1 if symbol is declared, otherwise to 0 in config.h
4
5Therefore we cannot rely on conditionals which check for it
6being defined or not since it always will be defined so correct
7thing is to use #if instead of #ifdef
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11Upstream-Status: Pending
12Index: 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
diff --git a/meta/recipes-core/util-linux/util-linux_2.21.1.bb b/meta/recipes-core/util-linux/util-linux_2.21.2.bb
index 8492cdf8e7..7f2c2a915f 100644
--- a/meta/recipes-core/util-linux/util-linux_2.21.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.21.2.bb
@@ -1,5 +1,5 @@
1MAJOR_VERSION = "2.21" 1MAJOR_VERSION = "2.21"
2PR = "r1" 2PR = "r0"
3require util-linux.inc 3require util-linux.inc
4 4
5# note that `lscpu' is under GPLv3+ 5# note that `lscpu' is under GPLv3+
@@ -8,11 +8,10 @@ LICENSE_${PN}-lscpu = "GPLv3+"
8SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ 8SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
9 file://util-linux-ng-2.16-mount_lock_path.patch \ 9 file://util-linux-ng-2.16-mount_lock_path.patch \
10 file://uclibc-__progname-conflict.patch \ 10 file://uclibc-__progname-conflict.patch \
11 file://fix_NL_TIME_FIRST_WEEKDAY.patch \
12" 11"
13 12
14SRC_URI[md5sum] = "3d9ad37bf8c5a8e6d0e165b020cf9ba5" 13SRC_URI[md5sum] = "b75b3cfecb943f74338382fde693c2c3"
15SRC_URI[sha256sum] = "4bf9641fd58454106589be8a8d1cfd61e7694f0a6912d8095d17b1fb94b85abe" 14SRC_URI[sha256sum] = "066f9d8e51bfabd809d266edcd54eefba1cdca57725b95c074fd47fe6fba3d30"
16 15
17# Only lscpu part is gplv3; rest of the code is not, 16# Only lscpu part is gplv3; rest of the code is not,
18# so take out the lscpu parts while running non-gplv3 build. 17# so take out the lscpu parts while running non-gplv3 build.