From 70f53c2bfaa3a5362d25d4ca5e8aa470ebafe82d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Beh=C3=BAn?= Date: Thu, 24 Sep 2020 21:35:12 +0200 Subject: [PATCH] coreutils: fix compilation for when selinux is present MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit According to https://bugs.gentoo.org/301782 coreutils does not respect --without-selinux correctly when libselinux.so is present on the target system (in the staging dir). This solves a weird issue of some coreutils programs not building (for example stdbuf), because the configure script uses -Werror to determine whether __attribute__((constructor)) is respected, but -Werror causes compilation to fail because of a warning about redefinition of HAVE_SELINUX_SELINUX_H macro. Signed-off-by: Marek Behún --- utils/coreutils/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/utils/coreutils/Makefile b/utils/coreutils/Makefile index fe25061aee..88bc2f0648 100644 --- a/utils/coreutils/Makefile +++ b/utils/coreutils/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=coreutils PKG_VERSION:=8.32 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/coreutils @@ -110,7 +110,11 @@ $(foreach a,$(COREUTILS_APPLETS),$(eval $(call GenPlugin,coreutils-$(a),$(a)))) CONFIGURE_VARS += \ gl_cv_func_mbrtowc_incomplete_state=yes \ gl_cv_func_mbrtowc_retval=yes \ - gl_cv_func_wcrtomb_retval=yes + gl_cv_func_wcrtomb_retval=yes \ + ac_cv_header_selinux_context_h=no \ + ac_cv_header_selinux_flash_h=no \ + ac_cv_header_selinux_selinux_h=no \ + ac_cv_search_setfilecon=no CONFIGURE_ARGS += \ --disable-xattr \