From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24684 invoked from network); 6 May 2008 09:14:04 -0000 X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00 autolearn=ham version=3.2.4 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 6 May 2008 09:14:04 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 46581 invoked from network); 6 May 2008 09:14:01 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 6 May 2008 09:14:01 -0000 Received: (qmail 14123 invoked by alias); 6 May 2008 09:13:58 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 24931 Received: (qmail 14098 invoked from network); 6 May 2008 09:13:57 -0000 Received: from bifrost.dotsrc.org (130.225.254.106) by sunsite.dk with SMTP; 6 May 2008 09:13:57 -0000 Received: from tim.des.no (unknown [194.63.250.121]) by bifrost.dotsrc.org (Postfix) with ESMTP id C733580ED172 for ; Tue, 6 May 2008 11:13:53 +0200 (CEST) Received: from ds4.des.no (des.no [80.203.243.180]) by smtp.des.no (Postfix) with ESMTP id 66680209C for ; Tue, 6 May 2008 11:13:53 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Zsh Hackers' List Subject: Re: zsh 4.3.6 FreeBSD bug References: <20080503073947.GA22661@redoubt.spodhuis.org> <864p9enuek.fsf@ds4.des.no> <86wsmamf2w.fsf@ds4.des.no> <20080505220236.GA81569@redoubt.spodhuis.org> <86lk2nn6fp.fsf@ds4.des.no> Date: Tue, 06 May 2008 11:13:52 +0200 In-Reply-To: <86lk2nn6fp.fsf@ds4.des.no> ("Dag-Erling =?utf-8?Q?Sm=C3=B8rg?= =?utf-8?Q?rav=22's?= message of "Tue\, 06 May 2008 11\:11\:06 +0200") Message-ID: <86hcdbn6b3.fsf@ds4.des.no> User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/23.0.60 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Virus-Scanned: ClamAV 0.91.2/7040/Tue May 6 03:52:15 2008 on bifrost X-Virus-Status: Clean --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Dag-Erling Sm=C3=B8rgrav writes: > For now, I've fixed the port by conditionally applying the attached > patch when building on a FreeBSD version that still has the old ncurses > library. Once more, with patch. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=extra-patch-ncurses --- configure.ac.orig 2008-03-28 12:49:32.000000000 +0100 +++ configure.ac 2008-05-05 09:47:30.860369561 +0200 @@ -669,20 +669,20 @@ termcap_curses_order="$ncursesw_test tinfo termcap $ncurses_test curses" ;; esac])dnl -AH_TEMPLATE([ZSH_CURSES_NEEDS_XOPEN], -[Define if the curses libraries need _XOPEN_SOURCE_EXTENDED defined]) -AC_CACHE_CHECK(if the curses library needs _XOPEN_SOURCE_EXTENDED, -zsh_cv_curses_needs_xopen, +AH_TEMPLATE([ZSH_NO_XOPEN], +[Define if _XOPEN_SOURCE_EXTENDED should not be defined to avoid clashes]) +AC_CACHE_CHECK(if _XOPEN_SOURCE_EXTENDED should not be defined, +zsh_cv_no_xopen, [case "$host_os" in - *openbsd*) - zsh_cv_curses_needs_xopen=no + *openbsd*|*freebsd*) + zsh_cv_no_xopen=yes ;; *) - zsh_cv_curses_needs_xopen=yes + zsh_cv_no_xopen=no ;; esac]) -if test x$zsh_cv_curses_needs_xopen = xyes; then - AC_DEFINE(ZSH_CURSES_NEEDS_XOPEN) +if test x$zsh_cv_no_xopen = xyes; then + AC_DEFINE(ZSH_NO_XOPEN) fi dnl Check for tigetflag (terminfo) before tgetent (termcap). --- Src/system.h.orig 2007-12-14 13:43:33.000000000 +0100 +++ Src/system.h 2008-05-05 09:50:17.333164563 +0200 @@ -52,9 +52,20 @@ # undef HAVE_SYS_UTSNAME_H #endif -#if defined(ZSH_CURSES_SOURCE) && defined(ZSH_CURSES_NEEDS_XOPEN) -#define _XOPEN_SOURCE_EXTENDED 1 -#endif +#ifndef ZSH_NO_XOPEN +# ifdef ZSH_CURSES_SOURCE +# define _XOPEN_SOURCE_EXTENDED 1 +# else +# ifdef MULTIBYTE_SUPPORT +/* + * Needed for wcwidth() which is part of XSI. + * Various other uses of the interface mean we can't get away with just + * _XOPEN_SOURCE. + */ +# define _XOPEN_SOURCE_EXTENDED 1 +# endif /* MULTIBYTE_SUPPORT */ +# endif /* ZSH_CURSES_SOURCE */ +#endif /* ZSH_NO_XOPEN */ /* * Solaris by default zeroes all elements of the tm structure in --=-=-=--