diff options
| -rw-r--r-- | groups.d/211.native_packages_cmdline.d/grep.package | 4 | ||||
| -rw-r--r-- | patches/grep-3.12.local.patch | 21 |
2 files changed, 23 insertions, 2 deletions
diff --git a/groups.d/211.native_packages_cmdline.d/grep.package b/groups.d/211.native_packages_cmdline.d/grep.package index 5b5134c3..0ea47a06 100644 --- a/groups.d/211.native_packages_cmdline.d/grep.package +++ b/groups.d/211.native_packages_cmdline.d/grep.package @@ -1,6 +1,6 @@ : ${PKG_GREP_DEPENDS:="pcre2"}; -: ${PKG_GREP_SHA256SUM:=1db2aedde89d0dea42b16d9528f894c8d15dae4e190b59aecc78f5a951276eab}; -: ${PKG_GREP_VERSION:=3.11}; +: ${PKG_GREP_SHA256SUM:=2649b27c0e90e632eadcd757be06c6e9a4f48d941de51e7c0f83ff76408a07b9}; +: ${PKG_GREP_VERSION:=3.12}; : ${PKG_GREP_URL:=https://ftp.gnu.org/gnu/grep/grep-${PKG_GREP_VERSION}.tar.xz}; : ${PKG_GREP_CONFIGURE_ARGS_EXTRA:=--enable-perl-regexp}; diff --git a/patches/grep-3.12.local.patch b/patches/grep-3.12.local.patch new file mode 100644 index 00000000..fecc8d8b --- /dev/null +++ b/patches/grep-3.12.local.patch @@ -0,0 +1,21 @@ +diff -ru grep-3.12.orig/gnulib-tests/getlocalename_l-unsafe.c grep-3.12/gnulib-tests/getlocalename_l-unsafe.c +--- grep-3.12.orig/gnulib-tests/getlocalename_l-unsafe.c 2025-04-02 23:47:17.000000000 +0200 ++++ grep-3.12/gnulib-tests/getlocalename_l-unsafe.c 2025-05-03 12:25:34.886160226 +0200 +@@ -30,7 +30,7 @@ + #endif + #include "setlocale_null.h" + +-#if (__GLIBC__ >= 2 && !defined __UCLIBC__) || (defined __linux__ && HAVE_LANGINFO_H) || defined __CYGWIN__ ++#if (__GLIBC__ >= 2 && !defined __UCLIBC__) || (defined __linux__ && HAVE_LANGINFO_H) || defined __CYGWIN__ || defined __midipix__ + # include <langinfo.h> + #endif + #if defined __sun +@@ -480,7 +480,7 @@ + nl_langinfo_l (_NL_LOCALE_NAME (category), locale). */ + name = locale->__names[category]; + return (struct string_with_storage) { name, STORAGE_OBJECT }; +-#elif defined __linux__ && HAVE_LANGINFO_H && defined NL_LOCALE_NAME ++#elif (defined __linux__ || defined __midipix__) && HAVE_LANGINFO_H && defined NL_LOCALE_NAME + /* musl libc */ + const char *name = nl_langinfo_l (NL_LOCALE_NAME (category), locale); + return (struct string_with_storage) { name, STORAGE_OBJECT }; |