diff options
| author | Manuel Frischknecht <manuel.frischknecht@gmail.com> | 2023-11-26 13:29:38 +0100 |
|---|---|---|
| committer | Manuel Frischknecht <manuel.frischknecht@gmail.com> | 2023-11-26 13:29:38 +0100 |
| commit | 8110ae5f411700bc186e768f01ec5103deebe181 (patch) | |
| tree | 421d5c26c8952c37a3079e0eaddae6e9a8a298b5 /pkgs | |
| parent | c9e65df9df9de665981916fdbf101937dd0af1db (diff) | |
osquery: also apply `Use-locale.h-instead-of-removed-xlocale.h-header.patch` on aarch64
The patch file fixes a build issue due to a missing `xlocale.h` header, but *only* for x86. aarch64 actually has the same issue, so expanding it hopefully also fixes that build, too.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/system/osquery/Use-locale.h-instead-of-removed-xlocale.h-header.patch | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/pkgs/tools/system/osquery/Use-locale.h-instead-of-removed-xlocale.h-header.patch b/pkgs/tools/system/osquery/Use-locale.h-instead-of-removed-xlocale.h-header.patch index 63dd5a387f30e..6c67653090533 100644 --- a/pkgs/tools/system/osquery/Use-locale.h-instead-of-removed-xlocale.h-header.patch +++ b/pkgs/tools/system/osquery/Use-locale.h-instead-of-removed-xlocale.h-header.patch @@ -1,15 +1,21 @@ -From: Jack Baldry <jack.baldry@grafana.com> -Date: Tue, 15 Nov 2022 14:34:33 -0400 -Subject: [PATCH] Use locale.h instead of removed xlocale.h header - -https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 - -Signed-off-by: Jack Baldry <jack.baldry@grafana.com> ---- - libraries/cmake/source/augeas/gnulib/generated/linux/x86_64/lib/locale.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - +diff --git a/libraries/cmake/source/augeas/gnulib/generated/linux/aarch64/lib/locale.h b/libraries/cmake/source/augeas/gnulib/generated/linux/aarch64/lib/locale.h +index 4f9baece2..afe947956 100644 +--- a/libraries/cmake/source/augeas/gnulib/generated/linux/aarch64/lib/locale.h ++++ b/libraries/cmake/source/augeas/gnulib/generated/linux/aarch64/lib/locale.h +@@ -48,9 +48,9 @@ + /* NetBSD 5.0 mis-defines NULL. */ + #include <stddef.h> + +-/* Mac OS X 10.5 defines the locale_t type in <xlocale.h>. */ ++/* Mac OS X 10.5 defines the locale_t type in <locale.h>. */ + #if 1 +-# include <xlocale.h> ++# include <locale.h> + #endif + + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ diff --git a/libraries/cmake/source/augeas/gnulib/generated/linux/x86_64/lib/locale.h b/libraries/cmake/source/augeas/gnulib/generated/linux/x86_64/lib/locale.h +index 4f9baece2..afe947956 100644 --- a/libraries/cmake/source/augeas/gnulib/generated/linux/x86_64/lib/locale.h +++ b/libraries/cmake/source/augeas/gnulib/generated/linux/x86_64/lib/locale.h @@ -48,9 +48,9 @@ @@ -24,6 +30,3 @@ diff --git a/libraries/cmake/source/augeas/gnulib/generated/linux/x86_64/lib/loc #endif /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ --- -2.38.1 - |