diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-12-01 14:45:39 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-03 12:14:30 +0000 |
commit | 0203b2b3af5858931fc82072551a264ec4506d52 (patch) | |
tree | 28946aa775299947330f4a02a100738ee7feaa64 /meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-__progname-conflict.patch | |
parent | 60a8f94c00101eff39428ff7548f45ffe1233103 (diff) | |
download | poky-0203b2b3af5858931fc82072551a264ec4506d52.tar.gz |
util-linux: Update to 2.20.1
Add patch remove setting CC, LD and LDFLAGS on commandline
since they are passed correctly via configure. Those setting
also caused the configure information about -std=gnu99 from
being passed correctly.
Removed patch that was fixed upstream
Added scanf configuration, since this is a cross-compile target check
libuuid removed an API that e2fsprogs uuidd used (uuid__generate_*),
thus we disable it in this patch and will now provide uuidd from
util-linux.
See http://sourceforge.net/projects/e2fsprogs/forums/forum/7053/topic/4639484
(From OE-Core rev: fdaf4e791fcacb48ea430ec768ad9a6919c65ce0)
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.20.1/uclibc-__progname-conflict.patch')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-__progname-conflict.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-__progname-conflict.patch b/meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-__progname-conflict.patch new file mode 100644 index 0000000000..45826b180a --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux-2.20.1/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]) | ||