diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch | |
download | poky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch b/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch new file mode 100644 index 0000000000..5031a7313e --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch | |||
@@ -0,0 +1,32 @@ | |||
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 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
18 | |||
19 | Upstream-Status: Pending | ||
20 | Index: util-linux-2.22.1/configure.ac | ||
21 | =================================================================== | ||
22 | --- util-linux-2.22.1.orig/configure.ac | ||
23 | +++ util-linux-2.22.1/configure.ac | ||
24 | @@ -372,7 +372,7 @@ esac | ||
25 | |||
26 | AC_MSG_CHECKING([whether program_invocation_short_name is defined]) | ||
27 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | ||
28 | - #include <argp.h> | ||
29 | + #include <errno.h> | ||
30 | ]], [[ | ||
31 | program_invocation_short_name = "test"; | ||
32 | ]])], [ | ||