From 890be8d4cfbfa48c05fde6f41fd76683f92dbf6b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 14:57:24 +0100 Subject: [PATCH] package/policycoreutils: fix build with BR2_TIME_BITS_64 Do not remove _FILE_OFFSET_BITS=64 from CFLAGS and CPPFLAGS to avoid the following build failure with BR2_TIME_BITS_64 raised since commit 3c427c64726560ea1743282a3fdb78f5b28692eb: In file included from /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/errno.h:25, from pp.c:20: /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ Indeed, this LFS workaround was there since the addition of the package in commit cb328f77f8f07bfd89d6b69385c941a7b281732b and is only needed to fix a build failure with the old codesourcery-arm toolchain from 2014 which uses glibc < 2.23. as glibc 2.23 was released in February 2016: https://sourceware.org/glibc/wiki/Release/2.23, drop this workaround as already done for libselinux in commit c1fa9bc2f7a4e5481edf4fce5c03dd45862fe72c. A follow-up patch will also drop codesourcery-arm toolchain. Fixes: 3c427c64726560ea1743282a3fdb78f5b28692eb - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 0ac2d5a41ad776b493e6b0c44c760968a28ec81e) Signed-off-by: Peter Korsgaard --- package/policycoreutils/policycoreutils.mk | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index 61d91066d4..0e639760fa 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -11,7 +11,7 @@ POLICYCOREUTILS_LICENSE_FILES = LICENSE POLICYCOREUTILS_CPE_ID_VENDOR = selinuxproject POLICYCOREUTILS_DEPENDENCIES = libsemanage libcap-ng $(TARGET_NLS_DEPENDENCIES) -POLICYCOREUTILS_MAKE_OPTS = LDLIBS=$(TARGET_NLS_LIBS) +POLICYCOREUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) LDLIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LINUX_PAM),y) POLICYCOREUTILS_DEPENDENCIES += linux-pam @@ -28,14 +28,6 @@ ifeq ($(BR2_PACKAGE_LINUX_PAM)$(BR2_PACKAGE_AUDIT),yy) POLICYCOREUTILS_MAKE_OPTS += LSPP_PRIV=y endif -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. -# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information -POLICYCOREUTILS_MAKE_OPTS += \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ - CPPFLAGS="$(TARGET_CPPFLAGS) -U_FILE_OFFSET_BITS" - POLICYCOREUTILS_MAKE_DIRS = \ load_policy newrole run_init \ secon semodule sestatus setfiles \ @@ -59,14 +51,9 @@ endef HOST_POLICYCOREUTILS_DEPENDENCIES = host-libsemanage -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. -# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information -# We also need to pass PREFIX because it defaults to $(DESTDIR)/usr +# We need to pass PREFIX because it defaults to $(DESTDIR)/usr HOST_POLICYCOREUTILS_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ - CFLAGS="$(HOST_CFLAGS) -U_FILE_OFFSET_BITS" \ - CPPFLAGS="$(HOST_CPPFLAGS) -U_FILE_OFFSET_BITS" \ PREFIX=$(HOST_DIR) \ ETCDIR=$(HOST_DIR)/etc \ SBINDIR=$(HOST_DIR)/sbin