aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-11-16 19:51:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-03 14:41:49 +0000
commitac807121ce3ba965f3e2a4f664a60ae4e33ce550 (patch)
tree0da00ae362c3c1c161b0607bceb6fe7cc9e11ecc /meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
parent1e05183289dbf77ebb1e7aa3375525a7d97eaf0f (diff)
downloadopenembedded-core-contrib-ac807121ce3ba965f3e2a4f664a60ae4e33ce550.tar.gz
openembedded-core-contrib-ac807121ce3ba965f3e2a4f664a60ae4e33ce550.tar.bz2
openembedded-core-contrib-ac807121ce3ba965f3e2a4f664a60ae4e33ce550.zip
util-linux: Update to 2.22.1
Fix the configure-sbindir test, which was not working correctly add a patch to configure to correctly test if the prefixes are conatined in libdir so they don't duplicate. Removed aarch64 patch since it been merged into this version Rebased util-linux-ng-replace-siginterrupt.patch Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch14
1 files changed, 7 insertions, 7 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
index 45826b180a..5b743cbc76 100644
--- a/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
+++ b/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
@@ -16,16 +16,16 @@ 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
+Index: util-linux-2.22.1/configure.ac
===================================================================
---- util-linux-2.19.1.orig/configure.ac
-+++ util-linux-2.19.1/configure.ac
-@@ -250,7 +250,7 @@ esac
+--- util-linux-2.22.1.orig/configure.ac
++++ util-linux-2.22.1/configure.ac
+@@ -372,7 +372,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])
+ [program_invocation_short_name = "test";],
+ AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1,
+ [Define if program_invocation_short_name is defined])