From dfadc720caa6e6031a69b1e6f19ffb36d327ae45 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 24 Feb 2022 04:40:42 +0100 Subject: coreutils: add OpenBSD compatibility patch --- package/coreutils/Makefile | 2 +- package/coreutils/patches/patch-src_ls_c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 package/coreutils/patches/patch-src_ls_c diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile index f5a1585a2..a30864aa6 100644 --- a/package/coreutils/Makefile +++ b/package/coreutils/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= coreutils PKG_VERSION:= 9.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= ce30acdf4a41bc5bb30dd955e9eaa75fa216b4e3deb08889ed32433c7b3b97ce PKG_DESCR:= file, shell and text utilities PKG_SECTION:= base/apps diff --git a/package/coreutils/patches/patch-src_ls_c b/package/coreutils/patches/patch-src_ls_c new file mode 100644 index 000000000..94cb5b58f --- /dev/null +++ b/package/coreutils/patches/patch-src_ls_c @@ -0,0 +1,20 @@ +--- coreutils-9.0.orig/src/ls.c 2021-09-24 13:31:05.000000000 +0200 ++++ coreutils-9.0/src/ls.c 2022-02-24 04:39:40.532579515 +0100 +@@ -2273,7 +2273,7 @@ decode_switches (int argc, char **argv) + if (linelen < 0) + { + /* Suppress bogus warning re comparing ws.ws_col to big integer. */ +-# if __GNUC_PREREQ (4, 6) ++# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) + # pragma GCC diagnostic push + # pragma GCC diagnostic ignored "-Wtype-limits" + # endif +@@ -2282,7 +2282,7 @@ decode_switches (int argc, char **argv) + && 0 <= ioctl (STDOUT_FILENO, TIOCGWINSZ, &ws) + && 0 < ws.ws_col) + linelen = ws.ws_col <= MIN (PTRDIFF_MAX, SIZE_MAX) ? ws.ws_col : 0; +-# if __GNUC_PREREQ (4, 6) ++# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) + # pragma GCC diagnostic pop + # endif + } -- cgit v1.2.3