On Fri, Sep 10, 2021 at 05:50:00PM +0200, Christian Weisgerber wrote:
> jas...@openbsd.org:
>
> > http://build-failures.rhaalovely.net/powerpc64/2021-09-09/sysutils/ggrep.log
>
> I guess something like this?
>
Note quite, here's a fixed diff.
The issue was that OpenBSD/powerpc64 also defines __powerpc__ in
addition to __powerpc64__ so it would still result in the incorrect
define.
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ggrep/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile 17 Aug 2021 15:12:07 -0000 1.39
+++ Makefile 10 Sep 2021 15:55:05 -0000
@@ -4,6 +4,7 @@ COMMENT= GNU versions of grep pattern ma
DISTNAME= grep-3.7
PKGNAME= g${DISTNAME}
+REVISION = 0
CATEGORIES= sysutils
HOMEPAGE= https://www.gnu.org/software/grep/grep.html
Index: patches/patch-lib_sigsegv_c
===================================================================
RCS file: patches/patch-lib_sigsegv_c
diff -N patches/patch-lib_sigsegv_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_sigsegv_c 10 Sep 2021 15:55:05 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+Index: lib/sigsegv.c
+--- lib/sigsegv.c.orig
++++ lib/sigsegv.c
+@@ -511,7 +511,14 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
+
+ # define SIGSEGV_FAULT_STACKPOINTER scp->sc_regs[29]
+
+-# elif defined __powerpc__ || defined __powerpc64__
++#elif defined(__powerpc64__)
++
++/* See the definition of 'struct sigcontext' and 'struct trapframe' in
++ openbsd-src/sys/arch/powerpc64/include/signal.h. */
++
++# define SIGSEGV_FAULT_STACKPOINTER scp->sc_sp
++
++# elif defined __powerpc__
+
+ /* See the definition of 'struct sigcontext' and 'struct trapframe' in
+ openbsd-src/sys/arch/powerpc/include/signal.h. */
