summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-__progname-conflict.patch31
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.19.1.bb4
2 files changed, 34 insertions, 1 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-__progname-conflict.patch b/meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-__progname-conflict.patch
new file mode 100644
index 0000000000..45826b180a
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-__progname-conflict.patch
@@ -0,0 +1,31 @@
1configure should include errno.h instead of argp.h when
2checking for presence of program_invocation_short_name
3uclibc defines this to be const char* unlike util-linux-ng
4which defines this to be char* so this error goes unnoticed
5on glibc/eglibc systems.
6
7here is the error it fixes
8
9in 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
13make[3]: *** [cache.lo] Error 1
14
15
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17
18Upstream-Status: Pending
19Index: 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])
diff --git a/meta/recipes-core/util-linux/util-linux_2.19.1.bb b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
index 7fe7497eb8..8067ab5ac5 100644
--- a/meta/recipes-core/util-linux/util-linux_2.19.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
@@ -6,7 +6,9 @@ require util-linux.inc
6LICENSE_util-linux-lscpu = "GPLv3+" 6LICENSE_util-linux-lscpu = "GPLv3+"
7 7
8SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ 8SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
9 file://util-linux-ng-2.16-mount_lock_path.patch" 9 file://util-linux-ng-2.16-mount_lock_path.patch \
10 file://uclibc-__progname-conflict.patch \
11"
10 12
11SRC_URI[md5sum] = "3eab06f05163dfa65479c44e5231932c" 13SRC_URI[md5sum] = "3eab06f05163dfa65479c44e5231932c"
12SRC_URI[sha256sum] = "d3eac4afcc687b3ae1ffedcab2dc12df84c7ba7045cce31386d2b7040a011c7d" 14SRC_URI[sha256sum] = "d3eac4afcc687b3ae1ffedcab2dc12df84c7ba7045cce31386d2b7040a011c7d"