mirror of
git://git.yoctoproject.org/poky
synced 2026-08-14 18:55:04 +00:00
2b41c2ad7e
util-linux 2.19 needs this patch to successfully compile on uclibc systems. This is a bug in util-linux that goes unnoticed on eglibc builds. (From OE-Core rev: a244bd1a8c98a970979e6bcfbd24c8a5b398ed0e) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
32 lines
1.5 KiB
Diff
32 lines
1.5 KiB
Diff
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])
|