Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Patched ncurses to 5.7-20101128
  • Loading branch information
mscdex committed Nov 29, 2010
1 parent e659e62 commit fd352b1
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 12 deletions.
7 changes: 6 additions & 1 deletion deps/ncurses/NEWS
Expand Up @@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.1614 2010/11/28 00:32:32 tom Exp $
-- $Id: NEWS,v 1.1615 2010/11/28 16:43:28 tom Exp $
-------------------------------------------------------------------------------

This is a log of changes that ncurses has gone through since Zeyd started
Expand All @@ -45,6 +45,11 @@ 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.

20101128
+ modify test/configure and test/Makefile.in to handle this special
case of building within a build-tree (Debian #34182):
mkdir -p build && cd build && ../test/configure && make

20101127
+ miscellaneous build-fixes for Ada95 and test-directories when built
out-of-tree.
Expand Down
4 changes: 2 additions & 2 deletions deps/ncurses/dist.mk
Expand Up @@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: dist.mk,v 1.782 2010/11/27 16:17:05 tom Exp $
# $Id: dist.mk,v 1.783 2010/11/28 16:43:43 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
Expand All @@ -37,7 +37,7 @@ SHELL = /bin/sh
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 5
NCURSES_MINOR = 7
NCURSES_PATCH = 20101127
NCURSES_PATCH = 20101128

# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Expand Down
4 changes: 2 additions & 2 deletions deps/ncurses/test/Makefile.in
@@ -1,4 +1,4 @@
# $Id: Makefile.in,v 1.107 2010/11/27 21:47:17 tom Exp $
# $Id: Makefile.in,v 1.108 2010/11/28 16:39:40 tom Exp $
##############################################################################
# Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. #
# #
Expand Down Expand Up @@ -72,7 +72,7 @@ CC = @CC@
CPP = @CPP@

CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@
CPPFLAGS = -I../test -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
CPPFLAGS = -I. -I$(srcdir) -I../test -DHAVE_CONFIG_H @CPPFLAGS@

CCFLAGS = $(CPPFLAGS) $(CFLAGS)

Expand Down
6 changes: 3 additions & 3 deletions deps/ncurses/test/configure
Expand Up @@ -15477,10 +15477,10 @@ for N in $LIST
do
cat >>Makefile <<TEST_EOF
\$(MODEL)/$N.o : $N.c \\
test.priv.h \\
\$(MODEL)/$N.o : \$(srcdir)/$N.c \\
\$(srcdir)/test.priv.h \\
ncurses_cfg.h
@echo compiling $N; \$(CC) -c \$(CFLAGS_DEFAULT) $N.c
@echo compiling $N; \$(CC) -c \$(CFLAGS_DEFAULT) \$(srcdir)/$N.c
TEST_EOF
done
Expand Down
8 changes: 4 additions & 4 deletions deps/ncurses/test/configure.in
Expand Up @@ -28,7 +28,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1996, etc.
dnl
dnl $Id: configure.in,v 1.84 2010/11/28 00:16:57 tom Exp $
dnl $Id: configure.in,v 1.85 2010/11/28 16:38:04 tom Exp $
dnl This is a simple configuration-script for the ncurses test programs that
dnl allows the test-directory to be separately configured against a reference
dnl system (i.e., sysvr4 curses)
Expand Down Expand Up @@ -293,10 +293,10 @@ for N in $LIST
do
cat >>Makefile <<TEST_EOF

\$(MODEL)/$N.o : $N.c \\
test.priv.h \\
\$(MODEL)/$N.o : \$(srcdir)/$N.c \\
\$(srcdir)/test.priv.h \\
ncurses_cfg.h
@echo compiling $N; \$(CC) -c \$(CFLAGS_DEFAULT) $N.c
@echo compiling $N; \$(CC) -c \$(CFLAGS_DEFAULT) \$(srcdir)/$N.c
TEST_EOF
done

Expand Down

0 comments on commit fd352b1

Please sign in to comment.