Browse Source

Merge pull request #16453 from paper42/grep-3.7

grep: update to 3.7
lilik-openwrt-22.03
Rosen Penev 3 years ago
committed by GitHub
parent
commit
bd070b80e3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions
  1. +2
    -2
      utils/grep/Makefile
  2. +15
    -0
      utils/grep/patches/ppc-musl.patch

+ 2
- 2
utils/grep/Makefile View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=grep PKG_NAME:=grep
PKG_VERSION:=3.6
PKG_VERSION:=3.7
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/grep PKG_SOURCE_URL:=@GNU/grep
PKG_HASH:=667e15e8afe189e93f9f21a7cd3a7b3f776202f417330b248c2ad4f997d9373e
PKG_HASH:=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
PKG_MAINTAINER:=Julen Landa Alustiza <julen@zokormazo.info> PKG_MAINTAINER:=Julen Landa Alustiza <julen@zokormazo.info>
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later


+ 15
- 0
utils/grep/patches/ppc-musl.patch View File

@ -0,0 +1,15 @@
https://github.com/void-linux/void-packages/commit/0d9556b8593d6e67027fb1c83d176b7f899547e5
--- a/lib/sigsegv.c
+++ b/lib/sigsegv.c
@@ -221,8 +221,10 @@ int libsigsegv_version = LIBSIGSEGV_VERS
/* both should be equivalent */
# if 0
# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
-# else
+# elif defined(__GLIBC__)
# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
+# else
+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1]
# endif
# endif

Loading…
Cancel
Save