mirror of
https://git.yoctoproject.org/poky
synced 2026-04-30 21:32:13 +02:00
ncurses: Drop unused patches
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4254 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -1,193 +0,0 @@
|
||||
|
||||
#
|
||||
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
|
||||
#
|
||||
|
||||
--- ncurses-5.3/./configure.in~configure
|
||||
+++ ncurses-5.3/./configure.in
|
||||
@@ -34,9 +34,10 @@
|
||||
dnl See http://invisible-island.net/autoconf/ for additional information.
|
||||
dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
-AC_PREREQ(2.13.20020210)
|
||||
+AC_PREREQ(2.57)
|
||||
AC_REVISION($Revision: 1.297 $)
|
||||
-AC_INIT(ncurses/base/lib_initscr.c)
|
||||
+AC_INIT
|
||||
+AC_CONFIG_SRCDIR([ncurses/base/lib_initscr.c])
|
||||
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
||||
|
||||
CF_SUBST_NCURSES_VERSION
|
||||
@@ -45,7 +46,7 @@
|
||||
[AC_MSG_WARN(overriding ABI version to $withval)
|
||||
cf_cv_abi_version=$withval])
|
||||
|
||||
-CF_CHECK_CACHE([AC_CANONICAL_SYSTEM])
|
||||
+CF_CHECK_CACHE([AC_CANONICAL_TARGET([])])
|
||||
AC_ARG_WITH(system-type,
|
||||
[ --with-system-type=XXX test: override derived host system-type],
|
||||
[AC_MSG_WARN(overriding system type to $withval)
|
||||
@@ -110,7 +111,7 @@
|
||||
CF_GXX_VERSION
|
||||
case $GXX_VERSION in
|
||||
1*|2.[[0-6]]*)
|
||||
- GXX=""; CXX=""; ac_cv_prog_gxx=no
|
||||
+ GXX=""; CXX=""; ac_cv_cxx_compiler_gnu=no
|
||||
cf_cxx_library=no
|
||||
AC_MSG_WARN(templates do not work)
|
||||
;;
|
||||
@@ -370,7 +371,7 @@
|
||||
if test "$CC_SHARED_OPTS" = "unknown"; then
|
||||
for model in $cf_list_models; do
|
||||
if test "$model" = "shared"; then
|
||||
- AC_ERROR(Shared libraries are not supported in this version)
|
||||
+ AC_MSG_ERROR([Shared libraries are not supported in this version])
|
||||
fi
|
||||
done
|
||||
fi
|
||||
@@ -457,7 +458,7 @@
|
||||
AC_ARG_ENABLE(big-core,
|
||||
[ --disable-big-core assume machine has little memory],
|
||||
[with_big_core=$enableval],
|
||||
- [AC_TRY_RUN([
|
||||
+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
int main() {
|
||||
@@ -466,10 +467,7 @@
|
||||
if (s != 0)
|
||||
s[0] = s[n-1] = 0;
|
||||
exit(s == 0);
|
||||
-}],
|
||||
- [with_big_core=yes],
|
||||
- [with_big_core=no],
|
||||
- [with_big_core=no])])
|
||||
+}]])],[with_big_core=yes],[with_big_core=no],[with_big_core=no])])
|
||||
AC_MSG_RESULT($with_big_core)
|
||||
test "$with_big_core" = "yes" && AC_DEFINE(HAVE_BIG_CORE)
|
||||
|
||||
@@ -484,7 +482,7 @@
|
||||
if test "$with_termcap" != "yes" ; then
|
||||
if test "$use_database" = no ; then
|
||||
if test -z "$with_fallback" ; then
|
||||
- AC_ERROR(You have disabled the database w/o specifying fallbacks)
|
||||
+ AC_MSG_ERROR([You have disabled the database w/o specifying fallbacks])
|
||||
fi
|
||||
fi
|
||||
AC_DEFINE(PURE_TERMINFO)
|
||||
@@ -903,7 +901,7 @@
|
||||
AC_SUBST(MATH_LIB)
|
||||
|
||||
### Checks for header files.
|
||||
-AC_STDC_HEADERS
|
||||
+AC_HEADER_STDC([])
|
||||
AC_HEADER_DIRENT
|
||||
AC_HEADER_TIME
|
||||
CF_REGEX
|
||||
@@ -937,7 +935,7 @@
|
||||
CF_SYS_TIME_SELECT
|
||||
|
||||
### checks for compiler characteristics
|
||||
-AC_LANG_C
|
||||
+AC_LANG([C])
|
||||
AC_C_CONST
|
||||
AC_C_INLINE
|
||||
test "$ac_cv_c_inline" != no && AC_DEFINE(CC_HAS_INLINE_FUNCS)
|
||||
@@ -1012,7 +1010,7 @@
|
||||
|
||||
# Check for C++ compiler characteristics (and ensure that it's there!)
|
||||
if test -n "$CXX" ; then
|
||||
- AC_LANG_CPLUSPLUS
|
||||
+ AC_LANG([C++])
|
||||
CF_STDCPP_LIBRARY
|
||||
|
||||
case $GXX_VERSION in
|
||||
@@ -1286,15 +1284,16 @@
|
||||
|
||||
################################################################################
|
||||
test "$use_database" = yes && SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
|
||||
-AC_OUTPUT( \
|
||||
+AC_CONFIG_FILES([\
|
||||
include/MKterm.h.awk \
|
||||
include/curses.head:include/curses.h.in \
|
||||
include/termcap.h \
|
||||
include/unctrl.h \
|
||||
$SUB_MAKEFILES \
|
||||
- Makefile,[
|
||||
+ Makefile])
|
||||
+AC_CONFIG_COMMANDS([default],[[
|
||||
CF_LIB_RULES
|
||||
-],[
|
||||
+]],[[
|
||||
### Special initialization commands, used to pass information from the
|
||||
### configuration-run into config.status
|
||||
|
||||
@@ -1324,5 +1323,6 @@
|
||||
cf_with_cxx_binding="$cf_with_cxx_binding"
|
||||
host="$host"
|
||||
|
||||
-],cat)dnl
|
||||
+]])
|
||||
+AC_OUTPUTdnl
|
||||
${MAKE-make} preinstall
|
||||
--- ncurses-5.3/./test/configure.in~configure
|
||||
+++ ncurses-5.3/./test/configure.in
|
||||
@@ -38,8 +38,9 @@
|
||||
dnl
|
||||
dnl See http://invisible-island.net/autoconf/ for additional information.
|
||||
dnl ---------------------------------------------------------------------------
|
||||
-AC_PREREQ(2.13.20020210)
|
||||
-AC_INIT(ncurses.c)
|
||||
+AC_PREREQ(2.57)
|
||||
+AC_INIT
|
||||
+AC_CONFIG_SRCDIR([ncurses.c])
|
||||
AC_CONFIG_HEADER(ncurses_cfg.h:ncurses_tst.hin)
|
||||
|
||||
CF_INHERIT_SCRIPT(config.guess)
|
||||
@@ -129,7 +130,7 @@
|
||||
|
||||
AC_TYPE_SIGNAL
|
||||
|
||||
-AC_STDC_HEADERS
|
||||
+AC_HEADER_STDC([])
|
||||
AC_HEADER_TIME
|
||||
AC_CHECK_HEADERS( \
|
||||
form.h \
|
||||
@@ -160,9 +161,8 @@
|
||||
wresize \
|
||||
)
|
||||
|
||||
-AC_TRY_LINK([
|
||||
-#include <${cf_cv_ncurses_header-curses.h}>],
|
||||
-[
|
||||
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
|
||||
+#include <${cf_cv_ncurses_header-curses.h}>]], [[
|
||||
(void) assume_default_colors (0, 0);
|
||||
(void) curses_version ();
|
||||
(void) define_key (0, 0);
|
||||
@@ -175,7 +175,7 @@
|
||||
(void) use_default_colors ();
|
||||
(void) use_extended_names (0);
|
||||
(void) wresize (0, 0, 0);
|
||||
- ],[AC_DEFINE(NCURSES_EXT_FUNCS)])
|
||||
+ ]])],[AC_DEFINE(NCURSES_EXT_FUNCS)],[])
|
||||
|
||||
CF_SYS_TIME_SELECT
|
||||
CF_FUNC_CURSES_VERSION
|
||||
@@ -186,7 +186,8 @@
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
-AC_OUTPUT(Makefile,[
|
||||
+AC_CONFIG_FILES([Makefile])
|
||||
+AC_CONFIG_COMMANDS([default],[[
|
||||
cat >>Makefile <<TEST_EOF
|
||||
|
||||
# These rules are generated so we do not rely on suffix rules, which do not
|
||||
@@ -204,4 +205,5 @@
|
||||
@echo compiling $N; \$(CC) -c \$(CFLAGS_DEFAULT) $N.c
|
||||
TEST_EOF
|
||||
done
|
||||
-],[],sort)
|
||||
+]],[[]])
|
||||
+AC_OUTPUT
|
||||
@@ -1,27 +0,0 @@
|
||||
|
||||
#
|
||||
# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher
|
||||
#
|
||||
|
||||
--- ncurses-4.2/aclocal.m4~mk_sharedlib
|
||||
+++ ncurses-4.2/aclocal.m4
|
||||
@@ -1201,7 +1201,7 @@
|
||||
linux*)
|
||||
# tested with Linux 2.0.29 and gcc 2.7.2 (ELF)
|
||||
CC_SHARED_OPTS='-fPIC'
|
||||
- MK_SHARED_LIB='gcc -o $[@].$(REL_VERSION) -L../lib -L\$(libdir) -shared -Wl,-soname,`basename $[@].$(ABI_VERSION)`,-stats,$(SHLIB_LIST)-lc'
|
||||
+ MK_SHARED_LIB='$(CC) -o $[@].$(REL_VERSION) -L../lib -shared -Wl,-soname,`basename $[@].$(ABI_VERSION)`,-stats,$(SHLIB_LIST)-lc'
|
||||
test $cf_cv_ld_rpath = yes && cf_ld_rpath_opt="-Wl,-rpath,"
|
||||
if test $DFT_LWR_MODEL = "shared" ; then
|
||||
LOCAL_LDFLAGS='-Wl,-rpath,../lib'
|
||||
--- ncurses-4.2/configure~mk_sharedlib
|
||||
+++ ncurses-4.2/configure
|
||||
@@ -2216,7 +2216,7 @@
|
||||
linux*)
|
||||
# tested with Linux 2.0.29 and gcc 2.7.2 (ELF)
|
||||
CC_SHARED_OPTS='-fPIC'
|
||||
- MK_SHARED_LIB='gcc -o $@.$(REL_VERSION) -L../lib -L\$(libdir) -shared -Wl,-soname,`basename $@.$(ABI_VERSION)`,-stats,$(SHLIB_LIST)-lc'
|
||||
+ MK_SHARED_LIB='$(CC) -o $@.$(REL_VERSION) -L../lib -shared -Wl,-soname,`basename $@.$(ABI_VERSION)`,-stats,$(SHLIB_LIST)-lc'
|
||||
test $cf_cv_ld_rpath = yes && cf_ld_rpath_opt="-Wl,-rpath,"
|
||||
if test $DFT_LWR_MODEL = "shared" ; then
|
||||
LOCAL_LDFLAGS='-Wl,-rpath,../lib'
|
||||
@@ -1,23 +0,0 @@
|
||||
|
||||
#
|
||||
# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher
|
||||
#
|
||||
|
||||
--- ncurses-4.2/misc/run_tic.sh~run_tic
|
||||
+++ ncurses-4.2/misc/run_tic.sh
|
||||
@@ -108,7 +108,14 @@
|
||||
SRC=$TMP
|
||||
fi
|
||||
|
||||
-if ( $srcdir/shlib tic -s $SRC )
|
||||
+if [ "$HOSTCC" != "$CC" ]
|
||||
+then
|
||||
+ SHLIB=""
|
||||
+else
|
||||
+ SHLIB="$srcdir/shlib"
|
||||
+fi
|
||||
+
|
||||
+if ( ${SHLIB} tic -s $SRC )
|
||||
then
|
||||
echo '** built new '$TERMINFO
|
||||
else
|
||||
@@ -1,19 +0,0 @@
|
||||
--- ncurses-5.2/misc/run_tic.in Mon Oct 9 16:57:35 2000
|
||||
+++ ncurses-5.2/misc/run_tic.in.new Thu Mar 14 17:13:20 2002
|
||||
@@ -105,7 +105,15 @@
|
||||
problems for older ncurses applications.
|
||||
|
||||
EOF
|
||||
-if ( $srcdir/shlib tic$suffix -s -o $TERMINFO $source )
|
||||
+
|
||||
+if [ "$BUILD_CC" != "$CC" ]
|
||||
+then
|
||||
+ SHLIB=""
|
||||
+else
|
||||
+ SHLIB="$srcdir/shlib"
|
||||
+fi
|
||||
+
|
||||
+if ( ${SHLIB} tic$suffix -s -o $TERMINFO $source )
|
||||
then
|
||||
echo '** built new '$TERMINFO
|
||||
else
|
||||
Reference in New Issue
Block a user