aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/util-linux/util-linux-2.21/uclibc-__progname-conflict.patch
blob: 45826b180afb88732e5955ab675d778f13af51c1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
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])