From: "Dag-Erling Smørgrav" <des@des.no>
To: Zsh Hackers' List <zsh-workers@sunsite.dk>
Subject: Re: zsh 4.3.6 FreeBSD bug
Date: Tue, 06 May 2008 11:13:52 +0200 [thread overview]
Message-ID: <86hcdbn6b3.fsf@ds4.des.no> (raw)
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")
[-- Attachment #1: Type: text/plain, Size: 276 bytes --]
Dag-Erling Smørgrav <des@des.no> 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
--
Dag-Erling Smørgrav - des@des.no
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: extra-patch-ncurses --]
[-- Type: text/x-patch, Size: 1786 bytes --]
--- 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
next prev parent reply other threads:[~2008-05-06 9:14 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-03 7:39 Phil Pennock
2008-05-04 12:08 ` Dag-Erling Smørgrav
2008-05-04 12:25 ` Dag-Erling Smørgrav
2008-05-05 22:02 ` Phil Pennock
2008-05-06 8:51 ` Peter Stephenson
2008-05-06 10:05 ` Dag-Erling Smørgrav
2008-05-06 9:11 ` Dag-Erling Smørgrav
2008-05-06 9:13 ` Dag-Erling Smørgrav [this message]
2008-05-06 9:24 ` Peter Stephenson
2008-05-06 10:24 ` Dag-Erling Smørgrav
2008-05-06 10:26 ` Peter Stephenson
2008-05-06 10:30 ` Dag-Erling Smørgrav
2008-05-06 10:42 ` Peter Stephenson
2008-05-06 11:51 ` Dag-Erling Smørgrav
2008-05-04 12:19 ` Peter Stephenson
2008-05-04 18:37 ` Peter Stephenson
2008-05-05 0:38 ` Phil Pennock
2008-05-05 0:41 ` Phil Pennock
2008-05-05 14:05 ` Peter Stephenson
2008-05-05 20:02 ` Jun T.
2008-05-06 2:32 ` Phil Pennock
2008-05-05 7:56 ` Dag-Erling Smørgrav
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86hcdbn6b3.fsf@ds4.des.no \
--to=des@des.no \
--cc=zsh-workers@sunsite.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).