diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-02-27 00:45:48 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-28 12:27:46 +0000 |
commit | 79e8d533eec5dc0b1831bd4c6e4959401c7f1fcb (patch) | |
tree | 6253b2390a781ad4e84a50108ca158b553890c4c /meta/recipes-core/util-linux/util-linux-2.21/uclibc-__progname-conflict.patch | |
parent | ef461c4a2a3e056adc875662f3c26f2cb4b9f161 (diff) | |
download | poky-79e8d533eec5dc0b1831bd4c6e4959401c7f1fcb.tar.gz |
util-linux: Update to 2.21
This updates various checksums for the COPYING files, which moved in the process
no changes to Licenses
Tweak the scanf_cv_alloc_modifier and rebase the patch
(From OE-Core rev: 9cb35b41c803bd0d1904b2dc0e14624fa7ea6e95)
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-2.21/uclibc-__progname-conflict.patch')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux-2.21/uclibc-__progname-conflict.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-2.21/uclibc-__progname-conflict.patch b/meta/recipes-core/util-linux/util-linux-2.21/uclibc-__progname-conflict.patch new file mode 100644 index 0000000000..45826b180a --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux-2.21/uclibc-__progname-conflict.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | configure should include errno.h instead of argp.h when | ||
2 | checking for presence of program_invocation_short_name | ||
3 | uclibc defines this to be const char* unlike util-linux-ng | ||
4 | which defines this to be char* so this error goes unnoticed | ||
5 | on glibc/eglibc systems. | ||
6 | |||
7 | here is the error it fixes | ||
8 | |||
9 | in file included from mountP.h:14:0, | ||
10 | from cache.c:29: | ||
11 | /home/kraj/work/slugos/build/tmp-slugos-uclibc/sysroots/nslu2le/usr/include/errno.h:55:46: error: conflicting types for '__progname' | ||
12 | ../../../include/c.h:118:14: note: previous declaration of '__progname' was here | ||
13 | make[3]: *** [cache.lo] Error 1 | ||
14 | |||
15 | |||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | |||
18 | Upstream-Status: Pending | ||
19 | Index: util-linux-2.19.1/configure.ac | ||
20 | =================================================================== | ||
21 | --- util-linux-2.19.1.orig/configure.ac | ||
22 | +++ util-linux-2.19.1/configure.ac | ||
23 | @@ -250,7 +250,7 @@ esac | ||
24 | |||
25 | |||
26 | AC_MSG_CHECKING(whether program_invocation_short_name is defined) | ||
27 | -AC_TRY_COMPILE([#include <argp.h>], | ||
28 | +AC_TRY_COMPILE([#include <errno.h>], | ||
29 | [program_invocation_short_name = "test";], | ||
30 | AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1, | ||
31 | [Define if program_invocation_short_name is defined]) | ||