diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-03-24 00:19:44 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-03-24 00:19:44 +0000 |
| commit | 134c14dc9d73526362390f08d82947782bffdea2 (patch) | |
| tree | 877df865b646ace30e96526802726dacd10cb3de /package/utils/util-linux/patches/001-no-printf-alloc.patch | |
| parent | 5c0cf7ea4c00d5652a26ad25cdafa4ce722ba6e4 (diff) | |
| download | upstream-134c14dc9d73526362390f08d82947782bffdea2.tar.gz upstream-134c14dc9d73526362390f08d82947782bffdea2.tar.bz2 upstream-134c14dc9d73526362390f08d82947782bffdea2.zip | |
[package] util-linux: update to 2.24.1
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40010 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/utils/util-linux/patches/001-no-printf-alloc.patch')
| -rw-r--r-- | package/utils/util-linux/patches/001-no-printf-alloc.patch | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/package/utils/util-linux/patches/001-no-printf-alloc.patch b/package/utils/util-linux/patches/001-no-printf-alloc.patch index e3f048ab3c..5acd2f06ed 100644 --- a/package/utils/util-linux/patches/001-no-printf-alloc.patch +++ b/package/utils/util-linux/patches/001-no-printf-alloc.patch @@ -1,17 +1,13 @@ -for systems that don't support latest POSIX standard: %as - -https://bugs.gentoo.org/406303 - --- a/configure.ac +++ b/configure.ac -@@ -688,7 +688,6 @@ AC_ARG_ENABLE([libmount], +@@ -769,7 +769,6 @@ AC_ARG_ENABLE([libmount], UL_BUILD_INIT([libmount]) UL_REQUIRES_LINUX([libmount]) UL_REQUIRES_BUILD([libmount], [libblkid]) -UL_REQUIRES_HAVE([libmount], [scanf_alloc_modifier], [scanf string alloc modifier]) - AM_CONDITIONAL(BUILD_LIBMOUNT, test "x$build_libmount" = xyes) + AM_CONDITIONAL([BUILD_LIBMOUNT], [test "x$build_libmount" = xyes]) + AM_CONDITIONAL([BUILD_LIBMOUNT_TESTS], [test "x$build_libmount" = xyes -a "x$enable_static" = xyes]) - AC_SUBST([LIBMOUNT_VERSION]) --- a/libmount/src/tab_parse.c +++ b/libmount/src/tab_parse.c @@ -22,6 +22,10 @@ @@ -90,7 +86,7 @@ https://bugs.gentoo.org/406303 &end); if (rc >= 7 && end > 0) -@@ -167,9 +202,15 @@ static int mnt_parse_mountinfo_line(stru +@@ -169,9 +204,15 @@ static int mnt_parse_mountinfo_line(stru UL_SCNsA" " /* (9) source */ UL_SCNsA, /* (10) fs options (fs specific) */ |