Skip to content

Commit

Permalink
diffutils: update to 3.8
Browse files Browse the repository at this point in the history
Fixes compilation with newer glibc.

Ported gnulib patch from m4.

Signed-off-by: Rosen Penev <[email protected]>
  • Loading branch information
neheb authored and Beginner-Go committed Jan 18, 2022
1 parent 3ba5d74 commit 3036ba6
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
6 changes: 3 additions & 3 deletions devel/diffutils/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=diffutils
PKG_VERSION:=3.7
PKG_RELEASE:=3
PKG_VERSION:=3.8
PKG_RELEASE:=$(AUTORELEASE)

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/diffutils
PKG_HASH:=b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26
PKG_HASH:=a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec

PKG_MAINTAINER:=Roger D <[email protected]>
PKG_LICENSE:=GPL-3.0
Expand Down
13 changes: 13 additions & 0 deletions devel/diffutils/patches/010-ppc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- a/lib/sigsegv.c
+++ b/lib/sigsegv.c
@@ -219,8 +219,8 @@ int libsigsegv_version = LIBSIGSEGV_VERS
# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1]
# else /* 32-bit */
/* both should be equivalent */
-# if 0
-# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
+# ifndef __GLIBC__
+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1]
# else
# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
# endif

0 comments on commit 3036ba6

Please sign in to comment.