| Message ID | 20240305134746.1124362-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/restorecond: fix build with BR2_TIME_BITS_64 | expand |
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > 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/fts.h:53, > from restore.h:6, > from restore.c:1: > /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 addititon of the package > in commit 9d6da7a264a5b36ad641a0d26b3a3d27188d3624 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 <fontaine.fabrice@gmail.com> Committed, thanks.
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > 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/fts.h:53, > from restore.h:6, > from restore.c:1: > /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 addititon of the package > in commit 9d6da7a264a5b36ad641a0d26b3a3d27188d3624 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 <fontaine.fabrice@gmail.com> Committed to 2024.02.x, thanks.
diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk index cd40905230..96ef8d2a50 100644 --- a/package/restorecond/restorecond.mk +++ b/package/restorecond/restorecond.mk @@ -11,13 +11,8 @@ RESTORECOND_LICENSE_FILES = LICENSE RESTORECOND_DEPENDENCIES = libglib2 libsepol libselinux dbus-glib -# 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 RESTORECOND_MAKE_OPTS += \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ - CPPFLAGS="$(TARGET_CPPFLAGS) -U_FILE_OFFSET_BITS" \ ARCH="$(BR2_ARCH)" # We need to pass DESTDIR at build time because it's used by
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/fts.h:53, from restore.h:6, from restore.c:1: /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 addititon of the package in commit 9d6da7a264a5b36ad641a0d26b3a3d27188d3624 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 <fontaine.fabrice@gmail.com> --- package/restorecond/restorecond.mk | 5 ----- 1 file changed, 5 deletions(-)