diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2012-04-30 11:26:24 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-03 15:00:28 +0100 |
| commit | 2114d734b9c4ace980ef9fa30dd5b5f76f49b934 (patch) | |
| tree | e2b7239da2360bb1a69c5552c17e87cf770ff9b2 /meta/recipes-core/util-linux/util-linux-2.21/uclibc-__progname-conflict.patch | |
| parent | 6a0dac89932b41502bb55a2dae07d835ca3c6245 (diff) | |
| download | openembedded-core-contrib-2114d734b9c4ace980ef9fa30dd5b5f76f49b934.tar.gz | |
util-linux: Update to 2.21.1
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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, 0 insertions, 31 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 deleted file mode 100644 index 45826b180a..0000000000 --- a/meta/recipes-core/util-linux/util-linux-2.21/uclibc-__progname-conflict.patch +++ /dev/null @@ -1,31 +0,0 @@ -configure should include errno.h instead of argp.h when -checking for presence of program_invocation_short_name -uclibc defines this to be const char* unlike util-linux-ng -which defines this to be char* so this error goes unnoticed -on glibc/eglibc systems. - -here is the error it fixes - -in file included from mountP.h:14:0, - from cache.c:29: -/home/kraj/work/slugos/build/tmp-slugos-uclibc/sysroots/nslu2le/usr/include/errno.h:55:46: error: conflicting types for '__progname' -../../../include/c.h:118:14: note: previous declaration of '__progname' was here -make[3]: *** [cache.lo] Error 1 - - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending -Index: util-linux-2.19.1/configure.ac -=================================================================== ---- util-linux-2.19.1.orig/configure.ac -+++ util-linux-2.19.1/configure.ac -@@ -250,7 +250,7 @@ esac - - - AC_MSG_CHECKING(whether program_invocation_short_name is defined) --AC_TRY_COMPILE([#include <argp.h>], -+AC_TRY_COMPILE([#include <errno.h>], - [program_invocation_short_name = "test";], - AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1, - [Define if program_invocation_short_name is defined]) |