mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2025-03-13 16:26:41 +08:00
ncurses 6.0 - patch 20170225
+ fixes for CF_CC_ENV_FLAGS (report by Ross Burton).
This commit is contained in:
Thomas E. Dickey
parent
ce4803687b
commit
c25392d9c2
54
Ada95/aclocal.m4
vendored
54
Ada95/aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.117 2017/01/21 22:20:17 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.118 2017/02/26 00:38:49 tom Exp $
|
||||
dnl Macros used in NCURSES Ada95 auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -97,7 +97,7 @@ AC_DEFUN([CF_ADD_ADAFLAGS],[
|
||||
AC_SUBST(ADAFLAGS)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_ADD_CFLAGS version: 12 updated: 2015/04/12 15:39:00
|
||||
dnl CF_ADD_CFLAGS version: 13 updated: 2017/02/25 18:57:40
|
||||
dnl -------------
|
||||
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
|
||||
dnl The second parameter if given makes this macro verbose.
|
||||
@ -127,10 +127,10 @@ case $cf_fix_cppflags in
|
||||
&& cf_fix_cppflags=yes
|
||||
|
||||
if test $cf_fix_cppflags = yes ; then
|
||||
cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
|
||||
CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
|
||||
continue
|
||||
elif test "${cf_tst_cflags}" = "\"'" ; then
|
||||
cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
|
||||
CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
@ -145,17 +145,17 @@ case $cf_fix_cppflags in
|
||||
CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
|
||||
;;
|
||||
esac
|
||||
cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
|
||||
CF_APPEND_TEXT(cf_new_cppflags,$cf_add_cflags)
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
(*)
|
||||
cf_new_cflags="$cf_new_cflags $cf_add_cflags"
|
||||
CF_APPEND_TEXT(cf_new_cflags,$cf_add_cflags)
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
(yes)
|
||||
cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
|
||||
CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
|
||||
|
||||
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
|
||||
|
||||
@ -168,17 +168,17 @@ done
|
||||
|
||||
if test -n "$cf_new_cflags" ; then
|
||||
ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
|
||||
CFLAGS="$CFLAGS $cf_new_cflags"
|
||||
CF_APPEND_TEXT(CFLAGS,$cf_new_cflags)
|
||||
fi
|
||||
|
||||
if test -n "$cf_new_cppflags" ; then
|
||||
ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
|
||||
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
|
||||
CF_APPEND_TEXT(CPPFLAGS,$cf_new_cppflags)
|
||||
fi
|
||||
|
||||
if test -n "$cf_new_extra_cppflags" ; then
|
||||
ifelse([$2],,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)])
|
||||
EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
|
||||
CF_APPEND_TEXT(EXTRA_CPPFLAGS,$cf_new_extra_cppflags)
|
||||
fi
|
||||
|
||||
AC_SUBST(EXTRA_CPPFLAGS)
|
||||
@ -336,6 +336,16 @@ ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]
|
||||
}
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_APPEND_TEXT version: 1 updated: 2017/02/25 18:58:55
|
||||
dnl --------------
|
||||
dnl use this macro for appending text without introducing an extra blank at
|
||||
dnl the beginning
|
||||
define([CF_APPEND_TEXT],
|
||||
[
|
||||
test -n "[$]$1" && $1="[$]$1 "
|
||||
$1="[$]{$1}$2"
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
|
||||
dnl --------------
|
||||
dnl Allow user to disable a normally-on option.
|
||||
@ -514,7 +524,7 @@ AC_SUBST(BUILD_EXEEXT)
|
||||
AC_SUBST(BUILD_OBJEXT)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_CC_ENV_FLAGS version: 6 updated: 2016/08/29 20:57:00
|
||||
dnl CF_CC_ENV_FLAGS version: 7 updated: 2017/02/25 18:57:40
|
||||
dnl ---------------
|
||||
dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
|
||||
dnl into CC. This will not help with broken scripts that wrap the compiler
|
||||
@ -537,13 +547,14 @@ case "$CC" in
|
||||
AC_MSG_RESULT(broken)
|
||||
AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
|
||||
# humor him...
|
||||
cf_flags=`echo "$CC" | sed -e 's/^.*[[ ]]\(-[[^ ]]\)/\1/'`
|
||||
CC=`echo "$CC " | sed -e 's/[[ ]]-[[^ ]].*$//' -e 's/[[ ]]*$//'`
|
||||
cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'`
|
||||
cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr([$]0,1+length(prog))); }'`
|
||||
CC="$cf_prog"
|
||||
for cf_arg in $cf_flags
|
||||
do
|
||||
case "x$cf_arg" in
|
||||
(x-[[IUDfgOW]]*)
|
||||
CF_ADD_CFLAGS($cf_flags)
|
||||
CF_ADD_CFLAGS($cf_arg)
|
||||
;;
|
||||
(*)
|
||||
CC="$CC $cf_arg"
|
||||
@ -2932,7 +2943,7 @@ define([CF_REMOVE_LIB],
|
||||
$1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'`
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_SHARED_OPTS version: 89 updated: 2015/08/15 18:38:59
|
||||
dnl CF_SHARED_OPTS version: 90 updated: 2017/02/11 14:48:57
|
||||
dnl --------------
|
||||
dnl --------------
|
||||
dnl Attempt to determine the appropriate CC/LD options for creating a shared
|
||||
@ -3001,7 +3012,20 @@ AC_DEFUN([CF_SHARED_OPTS],
|
||||
|
||||
# Some less-capable ports of gcc support only -fpic
|
||||
CC_SHARED_OPTS=
|
||||
|
||||
cf_try_fPIC=no
|
||||
if test "$GCC" = yes
|
||||
then
|
||||
cf_try_fPIC=yes
|
||||
else
|
||||
case $cf_cv_system_name in
|
||||
(*linux*) # e.g., PGI compiler
|
||||
cf_try_fPIC=yes
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if test "$cf_try_fPIC" = yes
|
||||
then
|
||||
AC_MSG_CHECKING(which $CC option to use)
|
||||
cf_save_CFLAGS="$CFLAGS"
|
||||
|
||||
2560
Ada95/configure
vendored
2560
Ada95/configure
vendored
File diff suppressed because it is too large
Load Diff
5
NEWS
5
NEWS
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.2760 2017/02/18 22:23:44 tom Exp $
|
||||
-- $Id: NEWS,v 1.2762 2017/02/26 00:35:38 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -45,6 +45,9 @@ 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.
|
||||
|
||||
20170225
|
||||
+ fixes for CF_CC_ENV_FLAGS (report by Ross Burton).
|
||||
|
||||
20170218
|
||||
+ fix several formatting issues with manual pages.
|
||||
+ correct read of terminfo entry in which all strings are absent or
|
||||
|
||||
66
aclocal.m4
vendored
66
aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.807 2017/02/11 19:48:57 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.808 2017/02/26 00:34:27 tom Exp $
|
||||
dnl Macros used in NCURSES auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -155,7 +155,7 @@ AC_DEFUN([CF_ADD_ADAFLAGS],[
|
||||
AC_SUBST(ADAFLAGS)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_ADD_CFLAGS version: 12 updated: 2015/04/12 15:39:00
|
||||
dnl CF_ADD_CFLAGS version: 13 updated: 2017/02/25 18:57:40
|
||||
dnl -------------
|
||||
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
|
||||
dnl The second parameter if given makes this macro verbose.
|
||||
@ -185,10 +185,10 @@ case $cf_fix_cppflags in
|
||||
&& cf_fix_cppflags=yes
|
||||
|
||||
if test $cf_fix_cppflags = yes ; then
|
||||
cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
|
||||
CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
|
||||
continue
|
||||
elif test "${cf_tst_cflags}" = "\"'" ; then
|
||||
cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
|
||||
CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
@ -203,17 +203,17 @@ case $cf_fix_cppflags in
|
||||
CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
|
||||
;;
|
||||
esac
|
||||
cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
|
||||
CF_APPEND_TEXT(cf_new_cppflags,$cf_add_cflags)
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
(*)
|
||||
cf_new_cflags="$cf_new_cflags $cf_add_cflags"
|
||||
CF_APPEND_TEXT(cf_new_cflags,$cf_add_cflags)
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
(yes)
|
||||
cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
|
||||
CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
|
||||
|
||||
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
|
||||
|
||||
@ -226,17 +226,17 @@ done
|
||||
|
||||
if test -n "$cf_new_cflags" ; then
|
||||
ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
|
||||
CFLAGS="$CFLAGS $cf_new_cflags"
|
||||
CF_APPEND_TEXT(CFLAGS,$cf_new_cflags)
|
||||
fi
|
||||
|
||||
if test -n "$cf_new_cppflags" ; then
|
||||
ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
|
||||
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
|
||||
CF_APPEND_TEXT(CPPFLAGS,$cf_new_cppflags)
|
||||
fi
|
||||
|
||||
if test -n "$cf_new_extra_cppflags" ; then
|
||||
ifelse([$2],,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)])
|
||||
EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
|
||||
CF_APPEND_TEXT(EXTRA_CPPFLAGS,$cf_new_extra_cppflags)
|
||||
fi
|
||||
|
||||
AC_SUBST(EXTRA_CPPFLAGS)
|
||||
@ -394,6 +394,16 @@ ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]
|
||||
}
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_APPEND_TEXT version: 1 updated: 2017/02/25 18:58:55
|
||||
dnl --------------
|
||||
dnl use this macro for appending text without introducing an extra blank at
|
||||
dnl the beginning
|
||||
define([CF_APPEND_TEXT],
|
||||
[
|
||||
test -n "[$]$1" && $1="[$]$1 "
|
||||
$1="[$]{$1}$2"
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
|
||||
dnl --------------
|
||||
dnl Allow user to disable a normally-on option.
|
||||
@ -429,29 +439,6 @@ ifelse([$3],,[ :]dnl
|
||||
])dnl
|
||||
])])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_ARG_OPTION version: 5 updated: 2015/05/10 19:52:14
|
||||
dnl -------------
|
||||
dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus
|
||||
dnl values.
|
||||
dnl
|
||||
dnl Parameters:
|
||||
dnl $1 = option name
|
||||
dnl $2 = help-string
|
||||
dnl $3 = action to perform if option is not default
|
||||
dnl $4 = action if perform if option is default
|
||||
dnl $5 = default option value (either 'yes' or 'no')
|
||||
AC_DEFUN([CF_ARG_OPTION],
|
||||
[AC_ARG_ENABLE([$1],[$2],[test "$enableval" != ifelse([$5],no,yes,no) && enableval=ifelse([$5],no,no,yes)
|
||||
if test "$enableval" != "$5" ; then
|
||||
ifelse([$3],,[ :]dnl
|
||||
,[ $3]) ifelse([$4],,,[
|
||||
else
|
||||
$4])
|
||||
fi],[enableval=$5 ifelse([$4],,,[
|
||||
$4
|
||||
])dnl
|
||||
])])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_AR_FLAGS version: 6 updated: 2015/10/10 15:25:05
|
||||
dnl -----------
|
||||
dnl Check for suitable "ar" (archiver) options for updating an archive.
|
||||
@ -740,7 +727,7 @@ AC_SUBST(BUILD_EXEEXT)
|
||||
AC_SUBST(BUILD_OBJEXT)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_CC_ENV_FLAGS version: 6 updated: 2016/08/29 20:57:00
|
||||
dnl CF_CC_ENV_FLAGS version: 7 updated: 2017/02/25 18:57:40
|
||||
dnl ---------------
|
||||
dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
|
||||
dnl into CC. This will not help with broken scripts that wrap the compiler
|
||||
@ -763,13 +750,14 @@ case "$CC" in
|
||||
AC_MSG_RESULT(broken)
|
||||
AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
|
||||
# humor him...
|
||||
cf_flags=`echo "$CC" | sed -e 's/^.*[[ ]]\(-[[^ ]]\)/\1/'`
|
||||
CC=`echo "$CC " | sed -e 's/[[ ]]-[[^ ]].*$//' -e 's/[[ ]]*$//'`
|
||||
cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'`
|
||||
cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr([$]0,1+length(prog))); }'`
|
||||
CC="$cf_prog"
|
||||
for cf_arg in $cf_flags
|
||||
do
|
||||
case "x$cf_arg" in
|
||||
(x-[[IUDfgOW]]*)
|
||||
CF_ADD_CFLAGS($cf_flags)
|
||||
CF_ADD_CFLAGS($cf_arg)
|
||||
;;
|
||||
(*)
|
||||
CC="$CC $cf_arg"
|
||||
@ -2798,7 +2786,7 @@ if test "$GXX" = yes; then
|
||||
fi
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_GXX_VERSION version: 7 updated: 2012/06/16 14:55:39
|
||||
dnl CF_GXX_VERSION version: 8 updated: 2017/02/11 14:48:57
|
||||
dnl --------------
|
||||
dnl Check for version of g++
|
||||
AC_DEFUN([CF_GXX_VERSION],[
|
||||
@ -5792,7 +5780,7 @@ CF_VERBOSE(...checked $1 [$]$1)
|
||||
AC_SUBST(EXTRA_LDFLAGS)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_SHARED_OPTS version: 89 updated: 2015/08/15 18:38:59
|
||||
dnl CF_SHARED_OPTS version: 90 updated: 2017/02/11 14:48:57
|
||||
dnl --------------
|
||||
dnl --------------
|
||||
dnl Attempt to determine the appropriate CC/LD options for creating a shared
|
||||
|
||||
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.1148 2017/02/18 13:13:37 tom Exp $
|
||||
# $Id: dist.mk,v 1.1149 2017/02/25 13:32:34 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 = 6
|
||||
NCURSES_MINOR = 0
|
||||
NCURSES_PATCH = 20170218
|
||||
NCURSES_PATCH = 20170225
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.0+20170218) unstable; urgency=low
|
||||
ncurses6 (6.0+20170225) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 18 Feb 2017 08:13:37 -0500
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 25 Feb 2017 08:32:34 -0500
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.0+20170218) unstable; urgency=low
|
||||
ncurses6 (6.0+20170225) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 18 Feb 2017 08:13:37 -0500
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 25 Feb 2017 08:32:34 -0500
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.0+20170218) unstable; urgency=low
|
||||
ncurses6 (6.0+20170225) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 18 Feb 2017 08:13:37 -0500
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 25 Feb 2017 08:32:34 -0500
|
||||
|
||||
ncurses6 (5.9-20120608) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; $Id: mingw-ncurses.nsi,v 1.199 2017/02/18 13:13:37 tom Exp $
|
||||
; $Id: mingw-ncurses.nsi,v 1.200 2017/02/25 13:32:34 tom Exp $
|
||||
|
||||
; TODO add examples
|
||||
; TODO bump ABI to 6
|
||||
@ -10,7 +10,7 @@
|
||||
!define VERSION_MAJOR "6"
|
||||
!define VERSION_MINOR "0"
|
||||
!define VERSION_YYYY "2017"
|
||||
!define VERSION_MMDD "0218"
|
||||
!define VERSION_MMDD "0225"
|
||||
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
|
||||
|
||||
!define MY_ABI "5"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: mingw32-ncurses6
|
||||
Version: 6.0
|
||||
Release: 20170218
|
||||
Release: 20170225
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: ncurses6
|
||||
Version: 6.0
|
||||
Release: 20170218
|
||||
Release: 20170225
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
39
test/aclocal.m4
vendored
39
test/aclocal.m4
vendored
@ -26,7 +26,7 @@ dnl sale, use or other dealings in this Software without prior written *
|
||||
dnl authorization. *
|
||||
dnl***************************************************************************
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.137 2017/01/21 22:18:40 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.138 2017/02/26 00:37:04 tom Exp $
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey
|
||||
dnl
|
||||
@ -89,7 +89,7 @@ define([CF_ACVERSION_COMPARE],
|
||||
[ifelse([$8], , ,[$8])],
|
||||
[ifelse([$9], , ,[$9])])])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_ADD_CFLAGS version: 12 updated: 2015/04/12 15:39:00
|
||||
dnl CF_ADD_CFLAGS version: 13 updated: 2017/02/25 18:57:40
|
||||
dnl -------------
|
||||
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
|
||||
dnl The second parameter if given makes this macro verbose.
|
||||
@ -119,10 +119,10 @@ case $cf_fix_cppflags in
|
||||
&& cf_fix_cppflags=yes
|
||||
|
||||
if test $cf_fix_cppflags = yes ; then
|
||||
cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
|
||||
CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
|
||||
continue
|
||||
elif test "${cf_tst_cflags}" = "\"'" ; then
|
||||
cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
|
||||
CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
@ -137,17 +137,17 @@ case $cf_fix_cppflags in
|
||||
CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
|
||||
;;
|
||||
esac
|
||||
cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
|
||||
CF_APPEND_TEXT(cf_new_cppflags,$cf_add_cflags)
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
(*)
|
||||
cf_new_cflags="$cf_new_cflags $cf_add_cflags"
|
||||
CF_APPEND_TEXT(cf_new_cflags,$cf_add_cflags)
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
(yes)
|
||||
cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
|
||||
CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
|
||||
|
||||
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
|
||||
|
||||
@ -160,17 +160,17 @@ done
|
||||
|
||||
if test -n "$cf_new_cflags" ; then
|
||||
ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
|
||||
CFLAGS="$CFLAGS $cf_new_cflags"
|
||||
CF_APPEND_TEXT(CFLAGS,$cf_new_cflags)
|
||||
fi
|
||||
|
||||
if test -n "$cf_new_cppflags" ; then
|
||||
ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
|
||||
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
|
||||
CF_APPEND_TEXT(CPPFLAGS,$cf_new_cppflags)
|
||||
fi
|
||||
|
||||
if test -n "$cf_new_extra_cppflags" ; then
|
||||
ifelse([$2],,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)])
|
||||
EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
|
||||
CF_APPEND_TEXT(EXTRA_CPPFLAGS,$cf_new_extra_cppflags)
|
||||
fi
|
||||
|
||||
AC_SUBST(EXTRA_CPPFLAGS)
|
||||
@ -341,6 +341,16 @@ ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]
|
||||
}
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_APPEND_TEXT version: 1 updated: 2017/02/25 18:58:55
|
||||
dnl --------------
|
||||
dnl use this macro for appending text without introducing an extra blank at
|
||||
dnl the beginning
|
||||
define([CF_APPEND_TEXT],
|
||||
[
|
||||
test -n "[$]$1" && $1="[$]$1 "
|
||||
$1="[$]{$1}$2"
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
|
||||
dnl --------------
|
||||
dnl Allow user to disable a normally-on option.
|
||||
@ -376,7 +386,7 @@ ifelse([$3],,[ :]dnl
|
||||
])dnl
|
||||
])])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_CC_ENV_FLAGS version: 6 updated: 2016/08/29 20:57:00
|
||||
dnl CF_CC_ENV_FLAGS version: 7 updated: 2017/02/25 18:57:40
|
||||
dnl ---------------
|
||||
dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
|
||||
dnl into CC. This will not help with broken scripts that wrap the compiler
|
||||
@ -399,13 +409,14 @@ case "$CC" in
|
||||
AC_MSG_RESULT(broken)
|
||||
AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
|
||||
# humor him...
|
||||
cf_flags=`echo "$CC" | sed -e 's/^.*[[ ]]\(-[[^ ]]\)/\1/'`
|
||||
CC=`echo "$CC " | sed -e 's/[[ ]]-[[^ ]].*$//' -e 's/[[ ]]*$//'`
|
||||
cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'`
|
||||
cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr([$]0,1+length(prog))); }'`
|
||||
CC="$cf_prog"
|
||||
for cf_arg in $cf_flags
|
||||
do
|
||||
case "x$cf_arg" in
|
||||
(x-[[IUDfgOW]]*)
|
||||
CF_ADD_CFLAGS($cf_flags)
|
||||
CF_ADD_CFLAGS($cf_arg)
|
||||
;;
|
||||
(*)
|
||||
CC="$CC $cf_arg"
|
||||
|
||||
3739
test/configure
vendored
3739
test/configure
vendored
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user