Remove use of deprecated ustat interface in glibc 2.28: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85835 Adapted to GCC 4 series from this upstream patch: https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=260684 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc @@ -81,7 +81,6 @@ #include #include #include -#include #include #include #include @@ -163,7 +162,19 @@ unsigned struct_old_utsname_sz = sizeof(struct old_utsname); unsigned struct_oldold_utsname_sz = sizeof(struct oldold_utsname); unsigned struct_itimerspec_sz = sizeof(struct itimerspec); - unsigned struct_ustat_sz = sizeof(struct ustat); + // Use pre-computed size of struct ustat to avoid which + // has been removed from glibc 2.28. +#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ + || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \ + || defined(__x86_64__) +#define SIZEOF_STRUCT_USTAT 32 +#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \ + || defined(__powerpc__) || defined(__s390__) +#define SIZEOF_STRUCT_USTAT 20 +#else +#error Unknown size of struct ustat +#endif + unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; #endif // SANITIZER_LINUX #if SANITIZER_LINUX && !SANITIZER_ANDROID 'get' action='/guix/log/guix.scm'>
AgeCommit message (Expand)Author
2022-07-12guix: Really export 'define-public'....This is a followup to 3858275962f1ac567b5dce2355035f9eddea0a05, which didn't have any effect. * guix.scm: Explicitly use (guix packages) so #:re-export-and-replace is effective. Ludovic Courtès
2021-09-14guix: Replace 'define-public'....This is a followup to 8531997d2a1e10d574a6e9ab70bc86ade6af4733. * guix.scm: Use #:re-export-and-replace for 'define-public'. Ludovic Courtès
2021-06-29(guix) no longer pulls in (guix ftp-client)....That choice was made in 2014 and never made much sense. * guix.scm (%public-modules): Remove 'ftp-client'. Ludovic Courtès