Re: Fix build of shells/zsh for sparc64

On Mon, May 30, 2022 at 04:45:16PM -0400, Kurt Mosiejczuk wrote:
> The patches for the 5.9 update which works fine for clang, but not for
> either base-gcc or ports-gcc. The patch to zpty.c uses #elifdef which
> clang knows, but wasn't introduced to gcc until 12.x.
>
> Better to use #elif defined, which works even on base-gcc.

Sorry, I've changed it in my local tree so it'll be correct when
upstreamed. One nit below.

> ok?
>
> (cc maintainer and last person who submitted an update)
>
> --Kurt
>
> Index: patches/patch-Src_Modules_zpty_c
> ===================================================================
> RCS file: /cvs/ports/shells/zsh/patches/patch-Src_Modules_zpty_c,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-Src_Modules_zpty_c
> --- patches/patch-Src_Modules_zpty_c 26 May 2022 07:44:43 -0000 1.1
> +++ patches/patch-Src_Modules_zpty_c 30 May 2022 20:25:22 -0000
> @@ -42,7 +42,7 @@ Index: Src/Modules/zpty.c
> + return 0;
> +}
> +
> -+#elifdef USE_DEV_PTMX
> ++#elif defined USE_DEV_PTMX

I'd prefer #elif defined(USE_DEV_PTMX) to match the rest of the file.

> +
> #ifdef HAVE_SYS_STROPTS_H
> #include <sys/stropts.h>
> Index: patches/patch-configure_ac
> ===================================================================
> RCS file: /cvs/ports/shells/zsh/patches/patch-configure_ac,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-configure_ac
> --- patches/patch-configure_ac 26 May 2022 07:44:43 -0000 1.5
> +++ patches/patch-configure_ac 30 May 2022 20:25:22 -0000
> @@ -1,7 +1,7 @@
> Index: configure.ac
> --- configure.ac.orig
> +++ configure.ac
> -@@ -2401,6 +2401,37 @@ dnl ---------------
> +@@ -2460,6 +2460,37 @@ dnl ---------------
> zsh_CHECK_SOCKLEN_T
>
> dnl ---------------