aboutsummaryrefslogtreecommitdiff
path: root/package/xfsprogs/xfsprogs.mk
diff options
context:
space:
mode:
authorGravatar Matt Weber <matthew.weber@rockwellcollins.com>2018-05-09 13:41:16 -0500
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-05-27 19:31:07 +0200
commit4da86cd4be7606015d0bb9bb2540ca62b2630369 (patch)
treeffbac1a7d22fd444964f8b47c077ce3f8fdc7826 /package/xfsprogs/xfsprogs.mk
parent775929c988db0197363a3c6f693fc3928bdb43de (diff)
downloadbuildroot-4da86cd4be7606015d0bb9bb2540ca62b2630369.tar.gz
buildroot-4da86cd4be7606015d0bb9bb2540ca62b2630369.tar.bz2
xfsprogs: bump to 4.16.1
Resolves build failures like: http://autobuild.buildroot.net/results/953/95307f0f56c7ead1bd1f0ab0049aeb8b30fdc11c/ libunistring to libicu conversion required modifications to 0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch and the libicu usage doesn't require the 0005-xfs_scrub-fix-cross-compile-with-libunistring.patch patch. I verified that the configuration time setup of the LIBICU library works correctly and doesn't require us to remove it. Upstream has reworked/included the following: 0003-workqueue-add-missing-pthreads-header.patch 0004-xfs_scrub-add-missing-paths-header.patch 0006-xfs_scrub-fix-build-with-older-kernel-headers.patch Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/xfsprogs/xfsprogs.mk')
-rw-r--r--package/xfsprogs/xfsprogs.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
index dffcc28ab7..814e0cf218 100644
--- a/package/xfsprogs/xfsprogs.mk
+++ b/package/xfsprogs/xfsprogs.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XFSPROGS_VERSION = 4.15.1
+XFSPROGS_VERSION = 4.16.1
XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs
XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz
XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers)
@@ -20,8 +20,11 @@ XFSPROGS_CONF_OPTS = \
INSTALL_GROUP=root \
--enable-static
-ifeq ($(BR2_PACKAGE_LIBUNISTRING),y)
-XFSPROGS_DEPENDENCIES += libunistring
+ifeq ($(BR2_PACKAGE_ICU),y)
+XFSPROGS_DEPENDENCIES += icu
+XFSPROGS_CONF_OPTS += --enable-libicu
+else
+XFSPROGS_CONF_OPTS += --disable-libicu
endif
XFSPROGS_INSTALL_TARGET_OPTS = DIST_ROOT=$(TARGET_DIR) install