coreutils: fix compilation for when selinux is present 13486/head
authorMarek Behún <kabel@blackhole.sk>
Thu, 24 Sep 2020 19:35:12 +0000 (21:35 +0200)
committerMarek Behún <kabel@blackhole.sk>
Fri, 25 Sep 2020 03:27:12 +0000 (05:27 +0200)
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 <kabel@blackhole.sk>
utils/coreutils/Makefile

index fe25061aeed55fcdcaf21feb7648151881aa7097..88bc2f064843519e0e8a28ef790541ca2ad37ab0 100644 (file)
@@ -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 \