Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Patched ncurses to 5.7-20100522

  • Loading branch information...
commit 9d647811f9159d3bb622ffa73c4ef7728882b53f 1 parent 5dcea9f
@mscdex authored
View
1  deps/ncurses/MANIFEST
@@ -836,6 +836,7 @@
./ncurses/base/version.c
./ncurses/base/vsscanf.c
./ncurses/base/wresize.c
+./ncurses/build.priv.h
./ncurses/curses.priv.h
./ncurses/fifo_defs.h
./ncurses/llib-lncurses
View
15 deps/ncurses/NEWS
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1543 2010/05/15 21:46:31 tom Exp $
+-- $Id: NEWS,v 1.1546 2010/05/22 18:46:54 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,19 @@ See the AUTHORS file for the corresponding full names.
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20100522
+ + correct cross-compiling configure check for CF_MKSTEMP macro, by
+ adding a check cache variable set by AC_CHECK_FUNC (report by
+ Pierre Labastie).
+ + simplify include-dependencies of make_hash and make_keys, to reduce
+ the need for setting BUILD_CPPFLAGS in cross-compiling when the
+ build- and target-machines differ.
+ + repair broken-linker configuration by restoring a definition of SP
+ variable to curses.priv.h, and adjusting for cases where sp-funcs
+ are used.
+ + improve configure macro CF_AR_FLAGS, allowing ARFLAGS environment
+ variable to override (prompted by report by Pablo Cazallas).
+
20100515
+ add configure option --enable-pthreads-eintr to control whether the
new EINTR feature is enabled.
View
33 deps/ncurses/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: aclocal.m4,v 1.519 2010/05/15 20:06:22 tom Exp $
+dnl $Id: aclocal.m4,v 1.524 2010/05/22 18:45:10 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@@ -388,7 +388,7 @@ ifelse($3,,[ :]dnl
])dnl
])])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_AR_FLAGS version: 4 updated: 2009/02/07 13:42:23
+dnl CF_AR_FLAGS version: 5 updated: 2010/05/20 20:24:29
dnl -----------
dnl Check for suitable "ar" (archiver) options for updating an archive.
AC_DEFUN([CF_AR_FLAGS],[
@@ -398,6 +398,16 @@ AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
cf_cv_ar_flags=unknown
for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
do
+
+ # check if $ARFLAGS already contains this choice
+ if test "x$ARFLAGS" != "x" ; then
+ cf_check_ar_flags=`echo "x$ARFLAGS" | sed -e "s/$cf_ar_flags\$//" -e "s/$cf_ar_flags / /"`
+ if test "x$ARFLAGS" != "$cf_check_ar_flags" ; then
+ cf_cv_ar_flags=
+ break
+ fi
+ fi
+
rm -f conftest.$ac_cv_objext
rm -f conftest.a
@@ -406,7 +416,8 @@ AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
int testdata[[3]] = { 123, 456, 789 };
EOF
if AC_TRY_EVAL(ac_compile) ; then
- $AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&AC_FD_CC 1>/dev/null
+ echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&AC_FD_CC
+ $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&AC_FD_CC 1>/dev/null
if test -f conftest.a ; then
cf_cv_ar_flags=$cf_ar_flags
break
@@ -418,8 +429,16 @@ EOF
done
rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
])
-test -z "$ARFLAGS" && ARFLAGS=$cf_cv_ar_flags
-AC_SUBST(ARFLAGS,$cf_cv_ar_flags)
+
+if test -n "$ARFLAGS" ; then
+ if test -n "$cf_cv_ar_flags" ; then
+ ARFLAGS="$ARFLAGS $cf_cv_ar_flags"
+ fi
+else
+ ARFLAGS=$cf_cv_ar_flags
+fi
+
+AC_SUBST(ARFLAGS)
])
dnl ---------------------------------------------------------------------------
dnl CF_AWK_BIG_PRINTF version: 3 updated: 2008/12/27 12:30:03
@@ -3832,7 +3851,7 @@ fi
test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MKSTEMP version: 5 updated: 2006/12/16 12:33:30
+dnl CF_MKSTEMP version: 6 updated: 2010/05/22 14:44:30
dnl ----------
dnl Check for a working mkstemp. This creates two files, checks that they are
dnl successfully created and distinct (AmigaOS apparently fails on the last).
@@ -3877,7 +3896,7 @@ int main()
],[AC_CHECK_FUNC(mkstemp)
])
])
-if test "$cf_cv_func_mkstemp" = yes ; then
+if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
AC_DEFINE(HAVE_MKSTEMP)
fi
])dnl
View
2,749 deps/ncurses/configure
1,383 additions, 1,366 deletions not shown
View
4 deps/ncurses/dist.mk
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.758 2010/05/15 16:27:22 tom Exp $
+# $Id: dist.mk,v 1.759 2010/05/20 10:43:30 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@ SHELL = /bin/sh
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 5
NCURSES_MINOR = 7
-NCURSES_PATCH = 20100515
+NCURSES_PATCH = 20100522
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
View
6 deps/ncurses/man/tabs.1
@@ -1,5 +1,5 @@
.\"***************************************************************************
-.\" Copyright (c) 2008,2009 Free Software Foundation, Inc. *
+.\" Copyright (c) 2008-2009,2010 Free Software Foundation, Inc. *
.\" *
.\" Permission is hereby granted, free of charge, to any person obtaining a *
.\" copy of this software and associated documentation files (the *
@@ -26,7 +26,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: tabs.1,v 1.3 2009/09/05 17:06:08 tom Exp $
+.\" $Id: tabs.1,v 1.4 2010/05/22 20:12:00 tom Exp $
.TH @TABS@ 1 ""
.ds n 5
.SH NAME
@@ -118,7 +118,7 @@ UNIVAC 1100 Assembler
.SH PORTABILITY
.PP
X/Open describes a \fB+m\fP option, to set a terminal's left-margin.
-None of the entries in the terminal database provide this capability.
+Very few of the entries in the terminal database provide this capability.
.PP
The \fB-d\fP (debug) and \fB-n\fP (no-op) options are extensions not provided
by other implementations.
View
4 deps/ncurses/ncurses/base/lib_getch.c
@@ -42,7 +42,7 @@
#include <curses.priv.h>
-MODULE_ID("$Id: lib_getch.c,v 1.118 2010/05/15 21:31:12 tom Exp $")
+MODULE_ID("$Id: lib_getch.c,v 1.119 2010/05/22 20:00:35 tom Exp $")
#include <fifo_defs.h>
@@ -265,7 +265,9 @@ fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl))
#else
unsigned char c2 = 0;
# if USE_PTHREADS_EINTR
+# if USE_WEAK_SYMBOLS
if ((pthread_self) && (pthread_kill) && (pthread_equal))
+# endif
_nc_globals.read_thread = pthread_self();
# endif
n = read(sp->_ifd, &c2, 1);
View
4 deps/ncurses/ncurses/base/lib_mouse.c
@@ -84,7 +84,7 @@
#define CUR SP_TERMTYPE
#endif
-MODULE_ID("$Id: lib_mouse.c,v 1.118 2010/05/15 21:31:12 tom Exp $")
+MODULE_ID("$Id: lib_mouse.c,v 1.119 2010/05/22 20:00:55 tom Exp $")
#include <tic.h>
@@ -867,7 +867,9 @@ _nc_mouse_inline(SCREEN *sp)
* We encode those as button presses.
*/
# if USE_PTHREADS_EINTR
+# if USE_WEAK_SYMBOLS
if ((pthread_self) && (pthread_kill) && (pthread_equal))
+# endif
_nc_globals.read_thread = pthread_self();
# endif
for (grabbed = 0; grabbed < 3; grabbed += (size_t) res) {
View
4 deps/ncurses/ncurses/base/lib_newterm.c
@@ -52,7 +52,7 @@
#include <tic.h>
-MODULE_ID("$Id: lib_newterm.c,v 1.85 2010/04/24 23:51:23 tom Exp $")
+MODULE_ID("$Id: lib_newterm.c,v 1.86 2010/05/20 23:25:18 tom Exp $")
#ifdef USE_TERM_DRIVER
#define NumLabels InfoOf(SP_PARM).numlabels
@@ -242,7 +242,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
#ifdef USE_TERM_DRIVER
TERMINAL_CONTROL_BLOCK *TCB;
#elif !NCURSES_SP_FUNCS
- SP_PARM = CURRENT_SCREEN;
+ _nc_set_screen(CURRENT_SCREEN);
#endif
assert(SP_PARM != 0);
cols = *(ptrCols(SP_PARM));
View
108 deps/ncurses/ncurses/build.priv.h
@@ -0,0 +1,108 @@
+/****************************************************************************
+ * Copyright (c) 2010 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+ * copy of this software and associated documentation files (the *
+ * "Software"), to deal in the Software without restriction, including *
+ * without limitation the rights to use, copy, modify, merge, publish, *
+ * distribute, distribute with modifications, sublicense, and/or sell *
+ * copies of the Software, and to permit persons to whom the Software is *
+ * furnished to do so, subject to the following conditions: *
+ * *
+ * The above copyright notice and this permission notice shall be included *
+ * in all copies or substantial portions of the Software. *
+ * *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
+ * *
+ * Except as contained in this notice, the name(s) of the above copyright *
+ * holders shall not be used in advertising or otherwise to promote the *
+ * sale, use or other dealings in this Software without prior written *
+ * authorization. *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Author: Thomas E. Dickey 2010 *
+ ****************************************************************************/
+
+
+/*
+ * $Id: build.priv.h,v 1.6 2010/05/22 20:30:35 tom Exp $
+ *
+ * build.priv.h
+ *
+ * This is a reduced version of curses.priv.h, for build-time utilties.
+ * Because it has fewer dependencies, this simplifies cross-compiling.
+ *
+ */
+
+#ifndef CURSES_PRIV_H
+#define CURSES_PRIV_H 1
+
+#include <ncurses_dll.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <ncurses_cfg.h>
+
+#if USE_RCS_IDS
+#define MODULE_ID(id) static const char Ident[] = id;
+#else
+#define MODULE_ID(id) /*nothing*/
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
+#include <assert.h>
+#include <stdio.h>
+
+#include <errno.h>
+
+#include <curses.h> /* we'll use -Ipath directive to get the right one! */
+
+/* usually in <unistd.h> */
+#ifndef EXIT_SUCCESS
+#define EXIT_SUCCESS 0
+#endif
+
+#ifndef EXIT_FAILURE
+#define EXIT_FAILURE 1
+#endif
+
+#define FreeAndNull(p) free(p); p = 0
+#define UChar(c) ((unsigned char)(c))
+#define SIZEOF(v) (sizeof(v) / sizeof(v[0]))
+
+#include <nc_alloc.h>
+
+/* declare these, to avoid needing term.h */
+#if BROKEN_LINKER || USE_REENTRANT
+#define NCURSES_ARRAY(name) \
+ NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, name)
+
+NCURSES_ARRAY(boolnames);
+NCURSES_ARRAY(boolfnames);
+NCURSES_ARRAY(numnames);
+NCURSES_ARRAY(numfnames);
+NCURSES_ARRAY(strnames);
+NCURSES_ARRAY(strfnames);
+#endif
+
+#if NO_LEAKS
+NCURSES_EXPORT(void) _nc_names_leaks(void);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CURSES_PRIV_H */
View
3  deps/ncurses/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
/*
- * $Id: curses.priv.h,v 1.462 2010/05/15 22:08:12 tom Exp $
+ * $Id: curses.priv.h,v 1.463 2010/05/20 23:22:46 tom Exp $
*
* curses.priv.h
*
@@ -1975,6 +1975,7 @@ extern NCURSES_EXPORT_VAR(int *) _nc_oldnums;
#define _nc_alloc_screen_sp() typeCalloc(SCREEN, 1)
#if BROKEN_LINKER
+#define SP _nc_screen()
extern NCURSES_EXPORT(SCREEN *) _nc_screen (void);
extern NCURSES_EXPORT(int) _nc_alloc_screen (void);
extern NCURSES_EXPORT(void) _nc_set_screen (SCREEN *);
View
6 deps/ncurses/ncurses/tinfo/make_hash.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@@ -37,14 +37,14 @@
*
*/
-#include <curses.priv.h>
+#include <build.priv.h>
#include <tic.h>
#include <hashsize.h>
#include <ctype.h>
-MODULE_ID("$Id: make_hash.c,v 1.2 2009/08/08 17:42:41 tom Exp $")
+MODULE_ID("$Id: make_hash.c,v 1.3 2010/05/22 18:02:50 tom Exp $")
/*
* _nc_make_hash_table()
View
4 deps/ncurses/ncurses/tinfo/make_keys.c
@@ -37,9 +37,9 @@
*/
#define USE_TERMLIB 1
-#include <curses.priv.h>
+#include <build.priv.h>
-MODULE_ID("$Id: make_keys.c,v 1.17 2010/05/01 19:17:28 tom Exp $")
+MODULE_ID("$Id: make_keys.c,v 1.18 2010/05/22 17:48:21 tom Exp $")
#include <names.c>
View
2  wscript
@@ -22,7 +22,7 @@ def configure(conf):
# configure ncurses
print "Configuring ncurses library ..."
- cmd = "cd deps/ncurses && ./configure --without-debug"
+ cmd = "cd deps/ncurses && sh configure --without-debug"
if os.system(cmd) != 0:
conf.fatal("Configuring ncurses failed.")
else:
Please sign in to comment.
Something went wrong with that request. Please try again.