From 3e7238e9d132cc8e048dea3e31744a044836f128 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 3 Feb 2022 23:31:24 +0100 Subject: [PATCH] package/util-linux: improve host build failure fix As suggested by Peter Seiderer package util-linux doesn't need raw support when built for host, so let's remove: HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE in favor of: HOST_UTIL_LINUX_CONF_OPTS += --disable-raw This is a better approach than my commit: https://git.buildroot.net/buildroot/commit/?id=d895bd973b35fde10d3dd7db530d9e4782926497 Suggested-by: Peter Seiderer Tested-by: Peter Seiderer Reviewed-by: Peter Seiderer Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 498117df1261c582ca70851c8a4f58db95632f2c) Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 5a4ff64d01..40fd518a58 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,7 +41,6 @@ define UTIL_LINUX_FIX_DISK_UTILS_COMPILE touch $(@D)/disk-utils/raw.8 endef UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE -HOST_UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf @@ -202,6 +201,11 @@ HOST_UTIL_LINUX_CONF_OPTS += \ --without-ncursesw \ --without-tinfo +# Disable raw command since starting from version 2.37 needs a +# work-around to build but in the end we don't need at all. +HOST_UTIL_LINUX_CONF_OPTS += \ + --disable-raw + ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) HOST_UTIL_LINUX_CONF_OPTS += --disable-makeinstall-chown # disable commands that have ncurses dependency, as well as