pkgsrc patches for zsh [was Re: tgoto issue in zsh-5.0.0]

[Thomas Klausner <tk@giga.or.at>]

[-- Attachment #1: Type: text/plain, Size: 844 bytes --]

On Thu, Aug 16, 2012 at 02:25:17PM +0100, Peter Stephenson wrote:
> It'll automatically be included in 5.0.1.

Great!

> When depends on how many bugs
> get fixed over the next few weeks, but a fairly early maintenance release for
> a new major version seems like a sensible idea... but not too early, since
> the reports are only trickling at the moment.

Ok, so if you have time, here are two patches that are currently in
pkgsrc for zsh.

Parts are for Interix and have been in pkgsrc for a long time. The
initial bug report was
	http://gnats.NetBSD.org/cgi-bin/query-pr-single.pl?number=25946
I can't test on Interix, so I can only forward them.

The other one is for NetBSD when using clang. If you need equivalent
patches for configure.{ac,in}, I can provide those as well.

Let me know if you have questions about them.

Thanks,
 Thomas

[-- Attachment #2: patch-ab --]
[-- Type: text/plain, Size: 551 bytes --]

$NetBSD: patch-ab,v 1.14 2012/08/16 14:19:35 wiz Exp $

Make this package build on Interix.  Patches provided by Hiramatsu
Yoshifumi in PR pkg/25946.

--- Src/zsh.h.orig	2011-05-16 15:49:11.000000000 +0000
+++ Src/zsh.h
@@ -2122,6 +2122,7 @@ struct ttyinfo {
 #endif
 };
 
+#ifndef __INTERIX
 /* defines for whether tabs expand to spaces */
 #if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H)
 #define SGTTYFLAG       shttyinfo.tio.c_oflag
@@ -2139,6 +2140,7 @@ struct ttyinfo {
 #   endif
 #  endif
 # endif
+#endif
 
 /* flags for termflags */
 

[-- Attachment #3: patch-ac --]
[-- Type: text/plain, Size: 1671 bytes --]

$NetBSD: patch-ac,v 1.24 2012/08/16 14:19:35 wiz Exp $

All chunks:
Make this package build on Interix.  Patches provided by Hiramatsu
Yoshifumi in PR pkg/25946.
Last chunk only:
Don't force -Wl,--whole-archive for NetBSD, it breaks the build with
clang, which doesn't have a reason to disable it again.

--- configure.orig	2011-05-16 15:49:15.000000000 +0000
+++ configure
@@ -11443,6 +11443,10 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
         DLLD="${DLLD=$CC}"
         DLLDARG=""
       ;;
+      *interix*)
+        DLLD="${DLLD=$CC}"
+        DLLDARG=""
+      ;;
       * )
 	DLLD="${DLLD=ld}"
 	DLLDARG=""
@@ -11453,6 +11457,7 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
     case "$host_os" in
       hpux*)   DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
       darwin*) DLCFLAGS="${DLCFLAGS=-fno-common}" ;;
+      interix*) DLCFLAGS="${DLCFLAGS=}" ;;
       *)       DLCFLAGS="${DLCFLAGS=-fPIC}" ;;
     esac
   else
@@ -11467,10 +11472,9 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
   fi
   case "$host_os" in
     osf*) DLLDFLAGS="${DLLDFLAGS=-shared -expect_unresolved '*'}" ;;
-    *freebsd*|linux*|irix*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
+    *freebsd*|*netbsd*|linux*|irix*|gnu*|interix*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
     sunos*)       DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
     sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;
-    netbsd*)      DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;;
     aix*)         DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;
     solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;;
     darwin*)      DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;;