From 6fb4e0382d3d4915fed3a8ab074f3d27eb32250d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 31 Mar 2012 00:19:55 +0200 Subject: [PATCH] util-linux: update to util-linux-2.21.1 Signed-off-by: Stephan Raue --- packages/sysutils/util-linux/build | 34 ++++++++++--------- packages/sysutils/util-linux/meta | 2 +- ...ile_path_for_scanf_cv_alloc_modifier.patch | 30 ---------------- 3 files changed, 19 insertions(+), 47 deletions(-) delete mode 100644 packages/sysutils/util-linux/patches/util-linux-2.21-add_a_crosscompile_path_for_scanf_cv_alloc_modifier.patch diff --git a/packages/sysutils/util-linux/build b/packages/sysutils/util-linux/build index 5e591b3de5..cc9bc3e365 100755 --- a/packages/sysutils/util-linux/build +++ b/packages/sysutils/util-linux/build @@ -24,7 +24,7 @@ cd $PKG_BUILD #scanf_cv_type_modifier=ms \ -gt_cv_func_gnugettext1_libintl=no \ +#gt_cv_func_gnugettext1_libintl=no \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ @@ -34,25 +34,26 @@ gt_cv_func_gnugettext1_libintl=no \ --enable-shared \ --disable-static \ --disable-gtk-doc \ - --enable-tls \ - --disable-mount \ - --enable-fsck \ - --disable-partx \ - --enable-libuuid \ - --enable-uuidd \ - --enable-libblkid \ - --disable-libmount \ - --disable-mountpoint \ - --enable-nls \ + --disable-nls \ --disable-rpath \ + --enable-tls \ + --enable-libuuid \ + --enable-libblkid \ + --enable-libmount \ + --disable-mount \ + --disable-libmount-mount \ + --disable-fsck \ + --disable-partx \ + --enable-uuidd \ + --disable-mountpoint \ + --disable-fallocate \ + --disable-unshare \ --disable-arch \ --disable-ddate \ --disable-agetty \ --disable-cramfs \ --disable-switch-root \ --disable-pivot-root \ - --disable-fallocate \ - --disable-unshare \ --disable-elvtune \ --disable-kill \ --disable-last \ @@ -74,11 +75,12 @@ gt_cv_func_gnugettext1_libintl=no \ --disable-makeinstall-chown \ --disable-makeinstall-setuid \ --with-gnu-ld \ + --without-selinux \ + --without-audit \ + --with-udev \ --without-ncurses \ --without-slang \ - --without-utempter \ - --without-selinux \ - --without-audit + --without-utempter make diff --git a/packages/sysutils/util-linux/meta b/packages/sysutils/util-linux/meta index 0e00aa2525..6a06b5b3f0 100644 --- a/packages/sysutils/util-linux/meta +++ b/packages/sysutils/util-linux/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="util-linux" -PKG_VERSION="2.21" +PKG_VERSION="2.21.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/util-linux/patches/util-linux-2.21-add_a_crosscompile_path_for_scanf_cv_alloc_modifier.patch b/packages/sysutils/util-linux/patches/util-linux-2.21-add_a_crosscompile_path_for_scanf_cv_alloc_modifier.patch deleted file mode 100644 index ae34b288be..0000000000 --- a/packages/sysutils/util-linux/patches/util-linux-2.21-add_a_crosscompile_path_for_scanf_cv_alloc_modifier.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b420e279691f8ac865ccdbccb377024a55debd41 Mon Sep 17 00:00:00 2001 -From: Sebastian Andrzej Siewior -Date: Fri, 24 Feb 2012 18:16:07 +0100 -Subject: [PATCH] build-sys: add a crosscompile path for - scanf_cv_alloc_modifier - -This allows to building the package cross again. Since the return value -is not used I guess there is little loss. - -Signed-off-by: Sebastian Andrzej Siewior ---- - configure.ac | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/configure.ac b/configure.ac -index eab9f85..966e9da 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -383,6 +383,8 @@ AC_CACHE_VAL([scanf_cv_alloc_modifier], - [scanf_cv_alloc_modifier=as], - [scanf_cv_alloc_modifier=no] - ) -+ , -+ [scanf_cv_alloc_modifier=no] - ) - ) - --- -1.7.5.4 -