mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2024-12-15 07:30:12 +08:00
ncurses 5.8 - patch 20110402
+ various build-fixes for the rpm/dpkg scripts. + add "--enable-rpath-link" option to Ada95/configure, to allow packages to suppress the rpath feature which is normally used for the in-tree build of sample programs. + corrected definition of libdir variable in Ada95/src/Makefile.in, needed for rpm script. + add "--with-shared" option to Ada95/configure script, to allow making the C-language parts of the binding use appropriate compiler options if building a shared library with gnat.
This commit is contained in:
Thomas E. Dickey
parent
362db2575a
commit
d91d170b30
6
Ada95/aclocal.m4
vendored
6
Ada95/aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.23 2011/03/28 00:08:52 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.24 2011/03/31 23:32:36 tom Exp $
|
||||
dnl Macros used in NCURSES Ada95 auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -1867,7 +1867,7 @@ AC_DEFUN([CF_MAIN_RETURN],
|
||||
cf_cv_main_return=return
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_MAKEFLAGS version: 13 updated: 2010/10/23 15:52:32
|
||||
dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46
|
||||
dnl ------------
|
||||
dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
|
||||
dnl options to lower-levels. It's very useful for "make -n" -- if we have it.
|
||||
@ -1884,7 +1884,7 @@ SHELL = /bin/sh
|
||||
all :
|
||||
@ echo '.$cf_option'
|
||||
CF_EOF
|
||||
cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[[ ]]*$,,'`
|
||||
cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[[ ]]*$,,'`
|
||||
case "$cf_result" in
|
||||
.*k)
|
||||
cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
|
||||
|
||||
1932
Ada95/configure
vendored
1932
Ada95/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -28,14 +28,14 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey
|
||||
dnl
|
||||
dnl $Id: configure.in,v 1.27 2011/03/27 23:14:55 tom Exp $
|
||||
dnl $Id: configure.in,v 1.30 2011/03/31 22:49:22 tom Exp $
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
dnl
|
||||
dnl See http://invisible-island.net/autoconf/ for additional information.
|
||||
dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
AC_PREREQ(2.13.20020210)
|
||||
AC_REVISION($Revision: 1.27 $)
|
||||
AC_REVISION($Revision: 1.30 $)
|
||||
AC_INIT(gen/gen.c)
|
||||
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
||||
|
||||
@ -160,6 +160,15 @@ CF_HELP_MESSAGE(Options to Specify the Libraries Built/Used:)
|
||||
### Use "--without-normal --with-shared" to allow the default model to be
|
||||
### shared, for example.
|
||||
cf_list_models=""
|
||||
|
||||
AC_MSG_CHECKING(if you want to build shared C-objects)
|
||||
AC_ARG_WITH(shared,
|
||||
[ --with-shared generate shared C-objects (needed for --with-ada-sharedlib)],
|
||||
[with_shared=$withval],
|
||||
[with_shared=no])
|
||||
AC_MSG_RESULT($with_shared)
|
||||
test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
|
||||
|
||||
AC_MSG_CHECKING(for specified models)
|
||||
test -z "$cf_list_models" && cf_list_models=normal
|
||||
AC_MSG_RESULT($cf_list_models)
|
||||
@ -206,6 +215,23 @@ AC_MSG_RESULT($LD_MODEL)
|
||||
|
||||
CF_SHARED_OPTS
|
||||
|
||||
# The test/sample programs in the original tree link using rpath option.
|
||||
# Make it optional for packagers.
|
||||
if test -n "$LOCAL_LDFLAGS"
|
||||
then
|
||||
AC_MSG_CHECKING(if you want to link sample programs with rpath option)
|
||||
AC_ARG_ENABLE(rpath-link,
|
||||
[ --enable-rpath-link link sample programs with rpath option],
|
||||
[with_rpath_link=$enableval],
|
||||
[with_rpath_link=yes])
|
||||
AC_MSG_RESULT($with_rpath_link)
|
||||
if test "$with_rpath_link" = no
|
||||
then
|
||||
LOCAL_LDFLAGS=
|
||||
LOCAL_LDFLAGS2=
|
||||
fi
|
||||
fi
|
||||
|
||||
###############################################################################
|
||||
CF_HELP_MESSAGE(Fine-Tuning Your Configuration:)
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
|
||||
/*
|
||||
Version Control
|
||||
$Id: gen.c,v 1.58 2011/03/25 23:55:30 tom Exp $
|
||||
$Id: gen.c,v 1.59 2011/03/31 23:50:24 tom Exp $
|
||||
--------------------------------------------------------------------------*/
|
||||
/*
|
||||
This program generates various record structures and constants from the
|
||||
@ -807,7 +807,7 @@ gen_keydefs(int mode)
|
||||
static void
|
||||
acs_def(const char *name, chtype *a)
|
||||
{
|
||||
int c = a - &acs_map[0];
|
||||
int c = (int)(a - &acs_map[0]);
|
||||
|
||||
printf(" %-24s : constant Character := ", name);
|
||||
if (isprint(UChar(c)) && (c != '`'))
|
||||
|
||||
@ -2,7 +2,7 @@ Summary: AdaCurses - Ada95 binding for ncurses
|
||||
%define AppProgram AdaCurses
|
||||
%define AppVersion MAJOR.MINOR
|
||||
%define AppRelease YYYYMMDD
|
||||
# $Id: AdaCurses.spec,v 1.5 2011/03/26 20:41:44 tom Exp $
|
||||
# $Id: AdaCurses.spec,v 1.12 2011/04/01 00:08:32 tom Exp $
|
||||
Name: %{AppProgram}
|
||||
Version: %{AppVersion}
|
||||
Release: %{AppRelease}
|
||||
@ -24,6 +24,8 @@ In addition to a library, this package installs sample programs in
|
||||
|
||||
%build
|
||||
|
||||
%define ada_libdir %{_prefix}/lib/ada/adalib
|
||||
|
||||
INSTALL_PROGRAM='${INSTALL}' \
|
||||
./configure \
|
||||
--target %{_target_platform} \
|
||||
@ -32,6 +34,8 @@ INSTALL_PROGRAM='${INSTALL}' \
|
||||
--libdir=%{_libdir} \
|
||||
--mandir=%{_mandir} \
|
||||
--datadir=%{_datadir} \
|
||||
--disable-rpath-link \
|
||||
--with-shared \
|
||||
--with-ada-sharedlib
|
||||
|
||||
make
|
||||
@ -43,6 +47,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
( cd samples &&
|
||||
make install.examples \
|
||||
DESTDIR=$RPM_BUILD_ROOT \
|
||||
BINDIR=$RPM_BUILD_ROOT%{_bindir}/%{AppProgram}
|
||||
)
|
||||
|
||||
@ -54,13 +59,20 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
||||
%{_bindir}/adacurses*-config
|
||||
%{_bindir}/%{AppProgram}/*
|
||||
%{_libdir}/libAdaCurses.*
|
||||
%{_libdir}/ada/adalib/libAdaCurses.*
|
||||
%{_libdir}/ada/adalib/terminal_interface*
|
||||
%{ada_libdir}/libAdaCurses.*
|
||||
%{ada_libdir}/terminal_interface*
|
||||
%{_mandir}/man1/adacurses*-config.1*
|
||||
%{_datadir}/%{AppProgram}/*
|
||||
%{_datadir}/ada/adainclude/terminal_interface*
|
||||
|
||||
%changelog
|
||||
# each patch should add its ChangeLog entries here
|
||||
|
||||
* Thu Mar 31 2010 Thomas Dickey
|
||||
- use --with-shared option for consistency with --with-ada-sharelib
|
||||
- ensure that MY_DATADIR is set when installing examples
|
||||
- add ada_libdir symbol to handle special case where libdir is /usr/lib64
|
||||
- use --disable-rpath-link to link sample programs without rpath
|
||||
|
||||
* Fri Mar 25 2010 Thomas Dickey
|
||||
- initial version
|
||||
|
||||
@ -34,6 +34,8 @@ configure-stamp:
|
||||
--host=$(DEB_HOST_GNU_TYPE) \
|
||||
--build=$(DEB_BUILD_GNU_TYPE) \
|
||||
--prefix=/usr \
|
||||
--disable-rpath-link \
|
||||
--with-shared \
|
||||
--with-ada-sharedlib
|
||||
|
||||
touch configure-stamp
|
||||
@ -66,7 +68,7 @@ install-stamp: build-stamp
|
||||
$(MAKE) install DESTDIR=$(TARGET_DIR)
|
||||
|
||||
# FIXME: it would be nice to make these into separate packages
|
||||
( cd samples && $(MAKE) install.examples DESTDIR=$(TARGET_DIR) )
|
||||
( cd samples && $(MAKE) install.examples DESTDIR=$(TARGET_DIR) BINDIR=$(SAMPLE_DIR) )
|
||||
( cd doc && $(MAKE) install.html DESTDIR=$(TARGET_DIR) )
|
||||
|
||||
touch install-stamp
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
#
|
||||
# Author: Juergen Pfeifer, 1996
|
||||
#
|
||||
# $Id: Makefile.in,v 1.59 2011/03/27 20:50:48 tom Exp $
|
||||
# $Id: Makefile.in,v 1.60 2011/03/31 09:46:16 tom Exp $
|
||||
#
|
||||
.SUFFIXES:
|
||||
|
||||
@ -45,7 +45,7 @@ srcdir = @srcdir@
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
includedir = @includedir@
|
||||
libdir = ${exec_prefix}/lib
|
||||
libdir = @libdir@
|
||||
|
||||
LIBDIR = $(DESTDIR)$(libdir)
|
||||
ADA_INCLUDE = $(DESTDIR)@ADA_INCLUDE@
|
||||
@ -295,14 +295,14 @@ uninstall.libs ::
|
||||
$(SHELL) -c 'for name in $(SOURCE_DIR_SRC)/*.ad[sb] $(GENERATED_SOURCES); do rm -f $(ADA_INCLUDE)/`basename $$name`; done'
|
||||
|
||||
@MAKE_ADA_SHAREDLIB@install \
|
||||
@MAKE_ADA_SHAREDLIB@install.libs :: $(ADA_OBJECTS)
|
||||
@MAKE_ADA_SHAREDLIB@install.libs :: $(ADA_OBJECTS) $(LIBDIR)
|
||||
@MAKE_ADA_SHAREDLIB@ $(INSTALL_LIB) \
|
||||
@MAKE_ADA_SHAREDLIB@ $(BUILD_DIR)/dynamic-ali/* \
|
||||
@MAKE_ADA_SHAREDLIB@ $(ADA_OBJECTS)
|
||||
@MAKE_ADA_SHAREDLIB@ $(INSTALL_LIB) \
|
||||
@MAKE_ADA_SHAREDLIB@ $(BUILD_DIR_LIB)/$(SHARED_LIBNAME) \
|
||||
@MAKE_ADA_SHAREDLIB@ $(LIBDIR)
|
||||
@MAKE_ADA_SHAREDLIB@ cd $(LIBDIR) && ln -s $(SHARED_LIBNAME) $(SHARED_SYMLINK)
|
||||
@MAKE_ADA_SHAREDLIB@ cd $(LIBDIR) && $(LN_S) $(SHARED_LIBNAME) $(SHARED_SYMLINK)
|
||||
@MAKE_ADA_SHAREDLIB@
|
||||
@MAKE_ADA_SHAREDLIB@uninstall \
|
||||
@MAKE_ADA_SHAREDLIB@uninstall.libs ::
|
||||
|
||||
24
INSTALL
24
INSTALL
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: INSTALL,v 1.153 2011/03/05 19:09:48 tom Exp $
|
||||
-- $Id: INSTALL,v 1.155 2011/03/31 08:27:24 tom Exp $
|
||||
---------------------------------------------------------------------
|
||||
How to install Ncurses/Terminfo on your system
|
||||
---------------------------------------------------------------------
|
||||
@ -433,7 +433,7 @@ SUMMARY OF CONFIGURE OPTIONS:
|
||||
changes several data references to functions to work around this
|
||||
problem.
|
||||
|
||||
NOTE: With ncurses 5.1, this may not be necessary, since we are
|
||||
NOTE: With ncurses 5.1, this may not be necessary, since we are
|
||||
told that some linkers interpret uninitialized global data as a
|
||||
different type of reference which behaves as described above. We have
|
||||
explicitly initialized all of the global data to work around the
|
||||
@ -462,7 +462,7 @@ SUMMARY OF CONFIGURE OPTIONS:
|
||||
warning. There will still be warnings due to subtle inconsistencies
|
||||
in the interface, but at a lower level.
|
||||
|
||||
NOTE: configuring ncurses with this option may detract from the
|
||||
NOTE: configuring ncurses with this option may detract from the
|
||||
portability of your applications by encouraging you to use const in
|
||||
places where the XSI curses interface would not allow them. Similar
|
||||
issues arise when porting to SVr4 curses, which uses const in even
|
||||
@ -483,7 +483,7 @@ SUMMARY OF CONFIGURE OPTIONS:
|
||||
encoded. This applies only to the wide-character (--enable-widec)
|
||||
configuration.
|
||||
|
||||
NOTE: using this option will make libraries which are not binary-
|
||||
NOTE: using this option will make libraries which are not binary-
|
||||
compatible with libncursesw 5.4. None of the interfaces change, but
|
||||
applications which have an array of cchar_t's must be recompiled.
|
||||
|
||||
@ -492,7 +492,7 @@ SUMMARY OF CONFIGURE OPTIONS:
|
||||
That allows one to use ncurses with a wheel mouse with xterm or
|
||||
similar X terminal emulators.
|
||||
|
||||
NOTE: using this option will make libraries which are not binary-
|
||||
NOTE: using this option will make libraries which are not binary-
|
||||
compatible with libncursesw 5.4. None of the interfaces change, but
|
||||
applications which have mouse mask mmask_t's must be recompiled.
|
||||
|
||||
@ -512,7 +512,7 @@ SUMMARY OF CONFIGURE OPTIONS:
|
||||
--enable-getcap-cache
|
||||
Cache translated termcaps under the directory $HOME/.terminfo
|
||||
|
||||
NOTE: this sounds good - it makes ncurses run faster the second time.
|
||||
NOTE: this sounds good - it makes ncurses run faster the second time.
|
||||
But look where the data comes from - an /etc/termcap containing lots of
|
||||
entries that are not up to date. If you configure with this option and
|
||||
forget to install the terminfo database before running an ncurses
|
||||
@ -668,6 +668,10 @@ SUMMARY OF CONFIGURE OPTIONS:
|
||||
--with-ada-sharedlib
|
||||
Build a shared library for Ada95 binding, if the compiler permits.
|
||||
|
||||
NOTE: You must also set the --with-shared option on some platforms
|
||||
for a successful build. You need not use this option when you set
|
||||
--with-shared, unless you want to use the Ada shared library.
|
||||
|
||||
--with-bool=TYPE
|
||||
If --without-cxx is specified, override the type used for the "bool"
|
||||
declared in curses.h (normally the type is automatically chosen to
|
||||
@ -817,7 +821,7 @@ SUMMARY OF CONFIGURE OPTIONS:
|
||||
make install DESTDIR=XXX
|
||||
since the makefiles pass that variable to subordinate makes.
|
||||
|
||||
NOTE: a few systems build shared libraries with fixed pathnames; this
|
||||
NOTE: a few systems build shared libraries with fixed pathnames; this
|
||||
option probably will not work for those configurations.
|
||||
|
||||
--with-libtool[=XXX]
|
||||
@ -923,7 +927,7 @@ SUMMARY OF CONFIGURE OPTIONS:
|
||||
which you are building, typically using a ".so" suffix, along with
|
||||
symbolic links that refer to the release version.
|
||||
|
||||
NOTE: Unless you override the configure script by setting the $CFLAGS
|
||||
NOTE: Unless you override the configure script by setting the $CFLAGS
|
||||
environment variable, these will not be built with the -g debugging
|
||||
option.
|
||||
|
||||
@ -937,6 +941,10 @@ SUMMARY OF CONFIGURE OPTIONS:
|
||||
$LD_LIBRARY_PATH to point to the build tree, e.g.,
|
||||
./misc/shlib make install
|
||||
|
||||
NOTE: If you use the --with-ada-sharedlib option, you should also
|
||||
set this option, to ensure that C-language modules needed for the
|
||||
Ada binding use appropriate compiler options.
|
||||
|
||||
--with-shlib-version=XXX
|
||||
Specify whether to use the release or ABI version for shared libraries.
|
||||
This is normally chosen automatically based on the type of system
|
||||
|
||||
1
MANIFEST
1
MANIFEST
@ -132,6 +132,7 @@
|
||||
./Ada95/src/c_varargs_to_ada.h
|
||||
./Ada95/src/library.gpr
|
||||
./Ada95/src/modules
|
||||
./Ada95/src/ncurses_compat.c
|
||||
./Ada95/src/terminal_interface-curses-aux.adb
|
||||
./Ada95/src/terminal_interface-curses-forms-field_types-alpha.adb
|
||||
./Ada95/src/terminal_interface-curses-forms-field_types-alpha.ads
|
||||
|
||||
13
NEWS
13
NEWS
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.1676 2011/03/29 09:42:32 tom Exp $
|
||||
-- $Id: NEWS,v 1.1680 2011/03/31 22:44:04 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -45,6 +45,17 @@ 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.
|
||||
|
||||
20110402
|
||||
+ various build-fixes for the rpm/dpkg scripts.
|
||||
+ add "--enable-rpath-link" option to Ada95/configure, to allow
|
||||
packages to suppress the rpath feature which is normally used for
|
||||
the in-tree build of sample programs.
|
||||
+ corrected definition of libdir variable in Ada95/src/Makefile.in,
|
||||
needed for rpm script.
|
||||
+ add "--with-shared" option to Ada95/configure script, to allow
|
||||
making the C-language parts of the binding use appropriate compiler
|
||||
options if building a shared library with gnat.
|
||||
|
||||
20110329
|
||||
> portability fixes for Ada95 binding:
|
||||
+ add configure check to ensure that SIGINT works with gnat. This is
|
||||
|
||||
6
aclocal.m4
vendored
6
aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.552 2011/03/28 00:21:01 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.553 2011/03/31 23:35:38 tom Exp $
|
||||
dnl Macros used in NCURSES auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -3504,7 +3504,7 @@ AC_DEFUN([CF_MAIN_RETURN],
|
||||
cf_cv_main_return=return
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_MAKEFLAGS version: 13 updated: 2010/10/23 15:52:32
|
||||
dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46
|
||||
dnl ------------
|
||||
dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
|
||||
dnl options to lower-levels. It's very useful for "make -n" -- if we have it.
|
||||
@ -3521,7 +3521,7 @@ SHELL = /bin/sh
|
||||
all :
|
||||
@ echo '.$cf_option'
|
||||
CF_EOF
|
||||
cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[[ ]]*$,,'`
|
||||
cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[[ ]]*$,,'`
|
||||
case "$cf_result" in
|
||||
.*k)
|
||||
cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
|
||||
|
||||
2
configure
vendored
2
configure
vendored
@ -3904,7 +3904,7 @@ SHELL = /bin/sh
|
||||
all :
|
||||
@ echo '.$cf_option'
|
||||
CF_EOF
|
||||
cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[ ]*$,,'`
|
||||
cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[ ]*$,,'`
|
||||
case "$cf_result" in
|
||||
.*k)
|
||||
cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
|
||||
|
||||
4
dist.mk
4
dist.mk
@ -25,7 +25,7 @@
|
||||
# use or other dealings in this Software without prior written #
|
||||
# authorization. #
|
||||
##############################################################################
|
||||
# $Id: dist.mk,v 1.807 2011/03/29 09:42:25 tom Exp $
|
||||
# $Id: dist.mk,v 1.808 2011/03/31 00:42:12 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 = 8
|
||||
NCURSES_PATCH = 20110329
|
||||
NCURSES_PATCH = 20110402
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user