util-linux: bump version to 2.23

Removed patches that were are now in version 2.23 of util-linux along with
fixed up other patches so they apply cleanly.

Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Ryan Barnett
2013-09-05 08:32:26 -05:00
committed by Peter Korsgaard
parent 2b5650cf7f
commit 66c0d5d05c
5 changed files with 118 additions and 168 deletions

View File

@@ -1,18 +1,11 @@
uClibc build fix: program_invocation_short_name is defined in errno.h
and not argp.h
Update to util-linux-2.22.2 from a previous patch by Khem.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
diff -Nura util-linux-2.22.2.orig/configure.ac util-linux-2.22.2/configure.ac
--- util-linux-2.22.2.orig/configure.ac 2013-03-07 15:16:18.912418476 -0300
+++ util-linux-2.22.2/configure.ac 2013-03-07 15:16:25.909640745 -0300
@@ -372,7 +372,7 @@
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])
--- a/configure.ac 2013-07-30 03:39:26.188738061 -0500
+++ b/configure.ac 2013-08-27 16:20:09.882953093 -0500
@@ -386,7 +386,7 @@
AC_MSG_CHECKING([whether program_invocation_short_name is defined])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <argp.h>
+ #include <errno.h>
]], [[
program_invocation_short_name = "test";
]])], [