summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-02-29 23:55:00 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-01 15:51:42 +0000
commita747fd40b0340666277857702a35f69aba926ced (patch)
tree13afa63b59e42b7191e9adbec0d7f66fb681402c /meta/recipes-core
parent4583dcc1da5e89996ce10243749760944ec03859 (diff)
downloadpoky-a747fd40b0340666277857702a35f69aba926ced.tar.gz
util-linux: Fix build when NLS is disabled
AC_CHECK_DECLS generated defines should be checked with #if not #ifdef (From OE-Core rev: 14b86a350d07b0da550a7a39886a660210918fbf) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.21/fix_NL_TIME_FIRST_WEEKDAY.patch24
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.21.bb5
2 files changed, 27 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-2.21/fix_NL_TIME_FIRST_WEEKDAY.patch b/meta/recipes-core/util-linux/util-linux-2.21/fix_NL_TIME_FIRST_WEEKDAY.patch
new file mode 100644
index 0000000000..545c3a9c7b
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux-2.21/fix_NL_TIME_FIRST_WEEKDAY.patch
@@ -0,0 +1,24 @@
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.bb b/meta/recipes-core/util-linux/util-linux_2.21.bb
index e21f484b79..744dbaf58b 100644
--- a/meta/recipes-core/util-linux/util-linux_2.21.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.21.bb
@@ -1,5 +1,5 @@
1MAJOR_VERSION = "2.21" 1MAJOR_VERSION = "2.21"
2PR = "r1" 2PR = "r2"
3require util-linux.inc 3require util-linux.inc
4 4
5# note that `lscpu' is under GPLv3+ 5# note that `lscpu' is under GPLv3+
@@ -7,7 +7,8 @@ LICENSE_util-linux-lscpu = "GPLv3+"
7 7
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 \
11" 12"
12 13
13SRC_URI[md5sum] = "3c7a26963f3921c1e775a80330321870" 14SRC_URI[md5sum] = "3c7a26963f3921c1e775a80330321870"