Browse Source

coreutils: add OpenBSD compatibility patch

Waldemar Brodkorb 2 years ago
parent
commit
dfadc720ca
2 changed files with 21 additions and 1 deletions
  1. 1 1
      package/coreutils/Makefile
  2. 20 0
      package/coreutils/patches/patch-src_ls_c

+ 1 - 1
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

+ 20 - 0
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
+         }