From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5474 invoked by alias); 16 Aug 2012 14:25:12 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 30621 Received: (qmail 20346 invoked from network); 16 Aug 2012 14:25:09 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.3.2 Received-SPF: none (ns1.primenet.com.au: domain at danbala.ifoer.tuwien.ac.at does not designate permitted sender hosts) Date: Thu, 16 Aug 2012 16:25:04 +0200 From: Thomas Klausner To: zsh-workers@zsh.org Subject: pkgsrc patches for zsh [was Re: tgoto issue in zsh-5.0.0] Message-ID: <20120816142504.GO2428@danbala.tuwien.ac.at> References: <20120816120421.GE2428@danbala.tuwien.ac.at> <20120816140734.20a7def9@pwslap01u.europe.root.pri> <20120816132053.GJ2428@danbala.tuwien.ac.at> <20120816142517.188972cd@pwslap01u.europe.root.pri> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="k+w/mQv8wyuph6w0" Content-Disposition: inline In-Reply-To: <20120816142517.188972cd@pwslap01u.europe.root.pri> --k+w/mQv8wyuph6w0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --k+w/mQv8wyuph6w0 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-ab $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 */ --k+w/mQv8wyuph6w0 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-ac $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}" ;; --k+w/mQv8wyuph6w0--