forked from pool/ncurses
Accepting request 343821 from Base:System
- Add ncurses patch 20151107 + modify tset's assignment to TERM in its output to reflect the name by which the terminal description is found, rather than the primary name. That was an unnecessary part from the initial conversion of tset from termcap to terminfo. The termcap program in 4.3BSD did this to avoid using the short 2-character name (report by Rich Burridge). + minor fix to configure script to ensure that rules for resulting.map are only generated when needed (cf: 20151101). + modify configure script to handle the case where tic-library is renamed, but the --with-debug option is used by itself without normal or shared libraries (prompted by comment in Debian #803482). - Add ncurses patch 20151101 + amend change for pkg-config which allows build of pc-files when no valid pkg-config library directory was configured to suppress the actual install if it is not overridden to a valid directory at install time (cf: 20150822). + modify editing script which generates resulting.map to work with the clang configuration on recent FreeBSD, which gives an error on an empty "local" section. + fix a spurious "(Part)" message in test/ncurses.c b/B tests due to incorrect attribute-masking. - Add ncurses patch 20151024 + modify MKexpanded.c to update the expansion of a temporary filename to "expanded.c", for use in trace statements. + modify layout of b/B tests in test/ncurses.c to allow for additional annotation on the right margin; some terminals with partial support did not display well. + fix typo in curs_attr.3x (patch by Sven Joachim). + fix typo in INSTALL (patch by Tomas Cech). OBS-URL: https://build.opensuse.org/request/show/343821 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=110
This commit is contained in:
commit
6465aa131b
@ -1,25 +0,0 @@
|
||||
---
|
||||
configure | 1 +
|
||||
configure.in | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
--- configure.in
|
||||
+++ configure.in 2012-01-30 16:31:47.000000000 +0000
|
||||
@@ -475,6 +475,7 @@ AC_ARG_ENABLE(overwrite,
|
||||
[with_overwrite=$enableval],
|
||||
[if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi])
|
||||
AC_MSG_RESULT($with_overwrite)
|
||||
+WITH_OVERWRITE=$with_overwrite
|
||||
|
||||
AC_MSG_CHECKING(if external terminfo-database is used)
|
||||
AC_ARG_ENABLE(database,
|
||||
--- configure
|
||||
+++ configure 2013-09-30 09:17:52.000000000 +0000
|
||||
@@ -6956,6 +6956,7 @@ else
|
||||
fi;
|
||||
echo "$as_me:6991: result: $with_overwrite" >&5
|
||||
echo "${ECHO_T}$with_overwrite" >&6
|
||||
+WITH_OVERWRITE="$with_overwrite"
|
||||
|
||||
echo "$as_me:6994: checking if external terminfo-database is used" >&5
|
||||
echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
|
@ -1,15 +0,0 @@
|
||||
---
|
||||
ncurses/Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- ncurses/Makefile.in
|
||||
+++ ncurses/Makefile.in 2015-08-13 15:08:16.989519655 +0000
|
||||
@@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) :
|
||||
$(SHELL) -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@
|
||||
|
||||
./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
|
||||
- $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
|
||||
+ $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS) -P" "$(AWK)" generated <../include/curses.h >$@
|
||||
|
||||
init_keytry.h: make_keys$(BUILD_EXEEXT) keys.list
|
||||
./make_keys$(BUILD_EXEEXT) keys.list > $@
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:00379206ba6ea322d8fe2697beec9ebe1dfffed3d7db1ec52e2a0273c1e5b2dd
|
||||
size 145857
|
||||
oid sha256:39ee3131b2dc9032ee759fc6b7e0cad509b1f0d69f4e5e445201affcc8a0ea98
|
||||
size 326038
|
||||
|
@ -1,47 +0,0 @@
|
||||
From: Michel Normand <normand@linux.vnet.ibm.com>
|
||||
Subject: ncurses 6.0 wildcard for ppc64
|
||||
Date: Fri, 25 Sep 2015 11:23:32 +0200
|
||||
|
||||
related to bug openSUSE 946048
|
||||
avoid ncurses build error on ppc64 architecture
|
||||
the nm tool is reporting _is_missing in Data section for ppc64.
|
||||
(by comparison ppc64le is reporting it in Text section)
|
||||
===
|
||||
[ 102s] /usr/lib64/gcc/powerpc64-suse-linux/5/../../../../powerpc64-suse-linux/bin/ld:resulting.map:113: syntax error in VERSION script
|
||||
[ 102s] collect2: error: ld returned 1 exit status
|
||||
===
|
||||
|
||||
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
|
||||
---
|
||||
aclocal.m4 | 3 ++-
|
||||
configure | 3 ++-
|
||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: ncurses-6.0/aclocal.m4
|
||||
===================================================================
|
||||
--- ncurses-6.0.orig/aclocal.m4
|
||||
+++ ncurses-6.0/aclocal.m4
|
||||
@@ -7625,7 +7625,8 @@ EOF
|
||||
if make -f conftest.mk 2>&AC_FD_CC >/dev/null
|
||||
then
|
||||
# test for missing symbol
|
||||
- cf_missing=`nm -P conftest.so 2>&AC_FD_CC |fgrep _ismissing | egrep '[[ ]]T[[ ]]'`
|
||||
+ # could be either Data or Text section
|
||||
+ cf_missing=`nm -P conftest.so 2>&AC_FD_CC |fgrep _ismissing | egrep '[[ ]][DT][[ ]]'`
|
||||
test -n "$cf_missing" && WILDCARD_SYMS=yes
|
||||
fi
|
||||
AC_MSG_RESULT($WILDCARD_SYMS)
|
||||
Index: ncurses-6.0/configure
|
||||
===================================================================
|
||||
--- ncurses-6.0.orig/configure
|
||||
+++ ncurses-6.0/configure
|
||||
@@ -6660,7 +6660,8 @@ EOF
|
||||
if make -f conftest.mk 2>&5 >/dev/null
|
||||
then
|
||||
# test for missing symbol
|
||||
- cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ ]T[ ]'`
|
||||
+ # could be either Data or Text section
|
||||
+ cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ ][DT][ ]'`
|
||||
test -n "$cf_missing" && WILDCARD_SYMS=yes
|
||||
fi
|
||||
echo "$as_me:6666: result: $WILDCARD_SYMS" >&5
|
@ -1,7 +1,6 @@
|
||||
---
|
||||
aclocal.m4 | 40 +++++++------
|
||||
configure | 41 +++++++------
|
||||
configure.in | 1
|
||||
include/curses.h.in | 3
|
||||
include/termcap.h.in | 2
|
||||
include/tic.h | 4 -
|
||||
@ -19,7 +18,7 @@
|
||||
ncurses/tinfo/read_entry.c | 2
|
||||
ncurses/tinfo/read_termcap.c | 21 ++++--
|
||||
test/test.priv.h | 4 -
|
||||
20 files changed, 239 insertions(+), 79 deletions(-)
|
||||
19 files changed, 238 insertions(+), 79 deletions(-)
|
||||
|
||||
--- aclocal.m4
|
||||
+++ aclocal.m4 2015-04-27 10:47:04.000000000 +0000
|
||||
@ -150,16 +149,6 @@
|
||||
;;
|
||||
esac
|
||||
done
|
||||
--- configure.in
|
||||
+++ configure.in 2012-01-30 16:31:47.000000000 +0000
|
||||
@@ -1918,6 +1918,7 @@ if test "$with_termlib" != no ; then
|
||||
TINFO_LDFLAGS="-L${LIB_DIR}"
|
||||
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
|
||||
fi
|
||||
+ TINFO_ARGS="$TINFO_ARGS -L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
|
||||
else
|
||||
# the next lines are needed for linking libtic over libncurses
|
||||
TINFO_NAME=${LIB_NAME}
|
||||
--- configure
|
||||
+++ configure 2015-04-27 10:46:08.000000000 +0000
|
||||
@@ -5857,7 +5857,7 @@ case $cf_cv_system_name in
|
||||
|
119
ncurses.changes
119
ncurses.changes
@ -1,3 +1,122 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 10 13:27:31 UTC 2015 - werner@suse.de
|
||||
|
||||
- Add ncurses patch 20151107
|
||||
+ modify tset's assignment to TERM in its output to reflect the name by
|
||||
which the terminal description is found, rather than the primary
|
||||
name. That was an unnecessary part from the initial conversion of
|
||||
tset from termcap to terminfo. The termcap program in 4.3BSD did
|
||||
this to avoid using the short 2-character name (report by Rich
|
||||
Burridge).
|
||||
+ minor fix to configure script to ensure that rules for resulting.map
|
||||
are only generated when needed (cf: 20151101).
|
||||
+ modify configure script to handle the case where tic-library is
|
||||
renamed, but the --with-debug option is used by itself without
|
||||
normal or shared libraries (prompted by comment in Debian #803482).
|
||||
- Add ncurses patch 20151101
|
||||
+ amend change for pkg-config which allows build of pc-files when no
|
||||
valid pkg-config library directory was configured to suppress the
|
||||
actual install if it is not overridden to a valid directory at
|
||||
install time (cf: 20150822).
|
||||
+ modify editing script which generates resulting.map to work with the
|
||||
clang configuration on recent FreeBSD, which gives an error on an
|
||||
empty "local" section.
|
||||
+ fix a spurious "(Part)" message in test/ncurses.c b/B tests due
|
||||
to incorrect attribute-masking.
|
||||
- Add ncurses patch 20151024
|
||||
+ modify MKexpanded.c to update the expansion of a temporary filename
|
||||
to "expanded.c", for use in trace statements.
|
||||
+ modify layout of b/B tests in test/ncurses.c to allow for additional
|
||||
annotation on the right margin; some terminals with partial support
|
||||
did not display well.
|
||||
+ fix typo in curs_attr.3x (patch by Sven Joachim).
|
||||
+ fix typo in INSTALL (patch by Tomas Cech).
|
||||
+ improve configure check for setting WILDCARD_SYMS variable; on ppc64
|
||||
the variable is in the Data section rather than Text (patch by Michel
|
||||
Normand).
|
||||
+ using configure option "--without-fallbacks" incorrectly caused
|
||||
FALLBACK_LIST to be set to "no" (patch by Tomas Cech).
|
||||
+ updated minitel entries to fix kel problem with emacs, and add
|
||||
minitel1b-nb (Alexandre Montaron).
|
||||
+ reviewed/updated nsterm entry Terminal.app in OSX -TD
|
||||
+ replace some dead URLs in comments with equivalents from the
|
||||
Internet Archive -TD
|
||||
+ update config.guess, config.sub from
|
||||
http://git.savannah.gnu.org/cgit/config.git
|
||||
- Add ncurses patch 20151017
|
||||
+ modify ncurses/Makefile.in to sort keys.list in POSIX locale
|
||||
(Debian #801864, patch by Esa Peuha).
|
||||
+ remove an early-return from _nc_do_color, which can interfere with
|
||||
data needed by bkgd when ncurses is configured with extended colors
|
||||
(patch by Denis Tikhomirov).
|
||||
> fixes for OS/2 (patches by KO Myung-Hun)
|
||||
+ use button instead of kbuf[0] in EMX-specific part of lib_mouse.c
|
||||
+ support building with libtool on OS/2
|
||||
+ use stdc++ on OS/2 kLIBC
|
||||
+ clear cf_XOPEN_SOURCE on OS/2
|
||||
- Remove patch ncurses-6.0-wildcard_for_ppc64.patch as this change is
|
||||
now upstream with patch set 20151024
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 31 12:04:22 UTC 2015 - sleep_walker@opensuse.org
|
||||
|
||||
- remove hunk from ncurses-6.0.dif modifying configure.in
|
||||
according to NEWS (20110924) it is not used anymore
|
||||
- drop ncurses-5.9-overwrite.dif as not neededd
|
||||
(WITH_OVERWRITE=$with_overwrite is in configure already twice anyway)
|
||||
- drop ncurses-6.0-avoid-line-markers.dif as not needed
|
||||
(see ncurses/base/MKlib_gen.sh 69-84)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 12 09:30:14 UTC 2015 - werner@suse.de
|
||||
|
||||
-Add ncurses patch 20151010
|
||||
+ add configure check for openpty to test/configure script, for ditto.
|
||||
+ minor fixes to test/view.c in investigating Debian #790847.
|
||||
+ update autoconf patch to 2.52.20150926, incorporates a fix for Cdk.
|
||||
+ add workaround for breakage of POSIX makefiles by recent binutils
|
||||
change.
|
||||
+ improve check for working poll() by using posix_openpt() as a
|
||||
fallback in case there is no valid terminal on the standard input
|
||||
(prompted by discussion on bug-ncurses mailing list, Debian #676461).
|
||||
-Add ncurses patch 20150926
|
||||
+ change makefile rule for removing resulting.map to distclean rather
|
||||
than clean.
|
||||
+ add /lib/terminfo to terminfo-dirs in ".deb" test-package.
|
||||
+ add note on portability of resizeterm and wresize to manual pages.
|
||||
- Add ncurses patch 20150919
|
||||
+ clarify in resizeterm.3x how KEY_RESIZE is pushed onto the input
|
||||
stream.
|
||||
+ clarify in curs_getch.3x that the keypad mode affects ability to
|
||||
read KEY_MOUSE codes, but does not affect KEY_RESIZE.
|
||||
+ add overlooked build-fix needed with Cygwin for separate Ada95
|
||||
configure script, cf: 20150606 (report by Nicolas Boulenguez)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 8 10:44:45 CEST 2015 - werner@suse.de
|
||||
|
||||
- Sedate the inflexible factory-auto checks
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 7 19:36:38 UTC 2015 - sleep_walker@opensuse.org
|
||||
|
||||
- remove macro defined system-wide already
|
||||
- remove special handling of patch which is no longer present
|
||||
- move tack replacement code to one spot under comment
|
||||
- remove duplicate parameters for configure
|
||||
- fix position of libgpm.so
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 7 12:05:37 UTC 2015 - werner@suse.de
|
||||
|
||||
- Simplify bootstrapping of libtinfo and its fallback.c
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 6 11:30:22 UTC 2015 - werner@suse.de
|
||||
|
||||
- Add some comments what is done in the spec file as well as
|
||||
do some modernisation, concretion, and clarification
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 25 09:42:43 UTC 2015 - normand@linux.vnet.ibm.com
|
||||
|
||||
|
115
ncurses.spec
115
ncurses.spec
@ -43,6 +43,10 @@ BuildRequires: gpm
|
||||
Obsoletes: ncurses-64bit
|
||||
%endif
|
||||
#
|
||||
# Note that this spec files does not only build the ABI version 6
|
||||
# but also build the ABI version 5 as this is part of the source
|
||||
# tar ball including the latest upstream fixes for ABI 5.
|
||||
#
|
||||
Version: 6.0
|
||||
Release: 0
|
||||
Summary: New curses Libraries
|
||||
@ -55,18 +59,15 @@ Source1: ncurses-6.0-patches.tar.bz2
|
||||
Source2: handle.linux
|
||||
Source3: README.devel
|
||||
Source4: ncurses-rpmlintrc
|
||||
Source5: tack-1.07-20150606.tar.bz2
|
||||
# Latest tack can be found at ftp://invisible-island.net/pub/ncurses/current/
|
||||
Source5: ftp://invisible-island.net/pub/ncurses/current/tack-1.07-20150606.tgz
|
||||
Source6: edit.sed
|
||||
Source7: baselibs.conf
|
||||
Patch0: ncurses-6.0.dif
|
||||
Patch1: ncurses-5.9-ibm327x.dif
|
||||
Patch3: ncurses-5.9-overwrite.dif
|
||||
Patch4: ncurses-5.7-tack.dif
|
||||
Patch5: ncurses-5.9-environment.dif
|
||||
Patch6: ncurses-6.0-avoid-line-markers.dif
|
||||
Patch7: ncurses-6.0-wildcard_for_ppc64.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%global _sysconfdir /etc
|
||||
%global _miscdir %{_datadir}/misc
|
||||
%global _incdir %{_includedir}
|
||||
%global root %{_tmppath}/%{name}-%{version}-store
|
||||
@ -259,7 +260,6 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
rm -fr tack
|
||||
rm -f Ada95/src/terminal_interface-curses.adb
|
||||
rm -f Ada95/src/library.gpr
|
||||
rm -f mkinstalldirs
|
||||
@ -267,24 +267,20 @@ tar xfj %{S:1}
|
||||
set +x
|
||||
for patch in patches/ncurses*.patch
|
||||
do
|
||||
case "$patch" in
|
||||
*/ncurses-5.9-20150516.patch)
|
||||
cat "$patch" | sh
|
||||
esac
|
||||
patch -f -T -p1 -s < $patch
|
||||
done
|
||||
set -x
|
||||
rm -rf patches/
|
||||
find -name '*.orig' | xargs -r rm -f
|
||||
tar xfj %{S:5}
|
||||
# replace tack from ncurses tarball with the latest version in
|
||||
# separate tarball
|
||||
rm -fr tack
|
||||
tar xfz %{S:5}
|
||||
mv tack-* tack
|
||||
%patch -P 1 -p0 -b .327x
|
||||
%patch -P 3 -p0 -b .ow
|
||||
%patch -P 4 -p0 -b .hs
|
||||
%patch -P 5 -p0 -b .lc
|
||||
%patch -P 0 -p0 -b .p0
|
||||
%patch -P 6 -p0 -b .p6
|
||||
%patch -P 7 -p1 -b .p7
|
||||
rm -vf include/ncurses_dll.h
|
||||
rm -vf mkdirs.sh
|
||||
rm -vf tar-copy.sh
|
||||
@ -293,6 +289,14 @@ rm -vf mk-dlls.sh
|
||||
sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
|
||||
|
||||
%build
|
||||
#
|
||||
# Note that there is a test if the system call poll(2) really works
|
||||
# on terminal or files. To make sure that even in OBS the configure
|
||||
# script has its own terminal we use screen here (could be also tmux).
|
||||
#
|
||||
# Remark: A better solution would be that in OBS a real pty/tty pair
|
||||
# would be used instead of redirecting stdout/stderr to a log file.
|
||||
#
|
||||
%global _configure screen -L -D -m ./configure
|
||||
SCREENDIR=$(mktemp -d ${PWD}/screen.XXXXXX) || exit 1
|
||||
SCREENRC=${SCREENDIR}/ncurses
|
||||
@ -311,6 +315,9 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
|
||||
silence on
|
||||
utf8 on
|
||||
EOF
|
||||
#
|
||||
# Used to test out various cflags of the gcc
|
||||
#
|
||||
cflags ()
|
||||
{
|
||||
local flag=$1; shift
|
||||
@ -360,20 +367,21 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
|
||||
GZIP="-9"
|
||||
export CC CFLAGS CXX CXXFLAGS GZIP TERM LDFLAGS
|
||||
#
|
||||
# Detect 64bit architecures and be sure that
|
||||
# we use an unsigned long for chtype to be
|
||||
# backward compatible with ncurses 5.4
|
||||
# Detect 64bit architecures and be sure that we use an
|
||||
# unsigned long for chtype to be backward compatible with
|
||||
# already existing ncurses applications. Otherwise we
|
||||
# might break existing applications on any update!
|
||||
#
|
||||
echo 'int main () { return !(sizeof(void*) >= 8); }' | gcc -x c -o test64 -
|
||||
if ./test64 ; then
|
||||
if test $(getconf LONG_BIT) -gt 32 ; then
|
||||
WITHCHTYPE="--with-chtype=long"
|
||||
else
|
||||
WITHCHTYPE=""
|
||||
CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCES -D_FILE_OFFSET_BITS=64"
|
||||
CFLAGS="${CFLAGS} $(getconf LFS_CFLAGS)"
|
||||
fi
|
||||
rm -f ./test64
|
||||
#
|
||||
# For security of some configure and install scripts
|
||||
# Let's care about people which build ncurses on their own
|
||||
# system. That is take care that some configure tests might
|
||||
# be exploitable below /tmp ... compare with aclocal.m4
|
||||
#
|
||||
TMPDIR=$(mktemp -d /tmp/ncurses.XXXXXXXX) || exit 1
|
||||
trap 'rm -rf ${TMPDIR}' EXIT
|
||||
@ -393,10 +401,6 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
|
||||
# No --enable-xmc-glitch because this seems to break yast2
|
||||
# on console/konsole (no magic cookie support on those?)
|
||||
#
|
||||
%if 0%{?suse_version} > 1310
|
||||
SO=$(rpm -ql gpm-devel|grep %{_libdir})
|
||||
SO=%{_libdir}/$(readlink $SO)
|
||||
%endif
|
||||
touch --reference=README config.sub config.guess
|
||||
> $SCREENLOG
|
||||
tail -q -s 0.5 -f $SCREENLOG & pid=$!
|
||||
@ -412,7 +416,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
|
||||
--with-manpage-aliases \
|
||||
--with-ospeed=speed_t \
|
||||
%if 0%{?suse_version} > 1310
|
||||
--with-gpm=$SO \
|
||||
--with-gpm=$(readlink %{_libdir}/libgpm.so) \
|
||||
%else
|
||||
--with-gpm \
|
||||
%endif
|
||||
@ -432,7 +436,6 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
|
||||
--enable-const \
|
||||
--enable-hashmap \
|
||||
--enable-no-padding \
|
||||
--enable-symlinks \
|
||||
--enable-sigwinch \
|
||||
--enable-colorfgbg \
|
||||
--enable-sp-funcs \
|
||||
@ -455,9 +458,13 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
|
||||
"${WITHCHTYPE}" \
|
||||
--disable-tic-depends \
|
||||
--with-cxx-shared \
|
||||
--with-ticlib=tic \
|
||||
--with-pc-suffix \
|
||||
--enable-pc-files \
|
||||
%if 0%{?_crossbuild}
|
||||
--with-fallbacks="$FALLBK" \
|
||||
%else
|
||||
--with-fallbacks="" \
|
||||
%endif
|
||||
%if %{with symversion}
|
||||
--with-versioned-syms=${PWD}/package/ncursest.map \
|
||||
%endif
|
||||
@ -468,17 +475,29 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
|
||||
sleep 1
|
||||
kill $pid
|
||||
#
|
||||
# The configure line
|
||||
# The configure line used above. Note that we override
|
||||
# several options later with other configurations.
|
||||
# It has been verified several times that this works.
|
||||
#
|
||||
c=$(grep '^ *$ *\./configure' config.log)
|
||||
make -C c++ etip.h
|
||||
make %{?_smp_mflags}
|
||||
#
|
||||
# This is a hack to be able to boot strap
|
||||
# a libncurses with correct fallback.c.
|
||||
# Refresh second install path
|
||||
#
|
||||
make %{?_smp_mflags} -C include
|
||||
make %{?_smp_mflags} -C ncurses fallback.c FALLBACK_LIST=""
|
||||
make %{?_smp_mflags} -C progs termsort.c transform.h infocmp tic
|
||||
rm -f ncurses/fallback.c
|
||||
rm -rf %{root}
|
||||
mkdir %{root}
|
||||
%if !0%{?_crossbuild}
|
||||
#
|
||||
# This is a hack to be able to boot strap libncurses with
|
||||
# our preferred fallback.c. For this we need the appropiate
|
||||
# tools list infocmp(1) and tic(1). The first step was with
|
||||
# an empty fallback.c, now we include the latest terminfo
|
||||
# of our preferred fallback terminfo list into the final
|
||||
# fallback.c.
|
||||
#
|
||||
cp -p progs/tic progs/tic.build
|
||||
cp -p progs/infocmp progs/infocmp.build
|
||||
PATH=$PWD/progs:$OPATH
|
||||
LD_LIBRARY_PATH=$PWD/lib
|
||||
export LD_LIBRARY_PATH PATH
|
||||
@ -486,16 +505,9 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
|
||||
TERMINFO=$PWD/tmp
|
||||
export TERMINFO
|
||||
mkdir -p $TERMINFO
|
||||
cp -p $PWD/../progs/tic $PWD/../progs/tic.build
|
||||
cp -p $PWD/../progs/infocmp $PWD/../progs/infocmp.build
|
||||
(cat > ${PWD}/.build_tic)<<-EOF
|
||||
%if 0%{?_crossbuild}
|
||||
export BUILD_TIC=/usr/bin/tic
|
||||
export BUILD_INFOCMP=/usr/bin/infocmp
|
||||
%else
|
||||
export BUILD_TIC=$PWD/../progs/tic.build
|
||||
export BUILD_INFOCMP=$PWD/../progs/infocmp.build
|
||||
%endif
|
||||
EOF
|
||||
. ${PWD}/.build_tic
|
||||
$BUILD_TIC -I -r -e $FALLBK ../misc/terminfo.src > terminfo.src
|
||||
@ -508,17 +520,18 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
|
||||
PATH=$OPATH
|
||||
unset LD_LIBRARY_PATH
|
||||
#
|
||||
# Refresh second install path
|
||||
#
|
||||
rm -rf %{root}
|
||||
mkdir %{root}
|
||||
#
|
||||
# Now rebuild libncurses and do the rest of this job
|
||||
#
|
||||
find -name fallback.o | xargs -r rm -vf
|
||||
cp fallback.c.build ncurses/fallback.c
|
||||
make -C c++ etip.h
|
||||
make %{?_smp_mflags}
|
||||
%else
|
||||
(cat > ${PWD}/.build_tic)<<-EOF
|
||||
export BUILD_TIC=/usr/bin/tic
|
||||
export BUILD_INFOCMP=/usr/bin/infocmp
|
||||
EOF
|
||||
%endif
|
||||
# must not use %jobs here (would lead to: ln: ncurses.h already exists)
|
||||
make install DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncurses libdir=%{_libdir}
|
||||
ln -sf %{_incdir}/ncurses/{curses,ncurses,term,termcap}.h %{root}%{_incdir}
|
||||
@ -559,8 +572,10 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
|
||||
--without-progs
|
||||
sleep 1
|
||||
kill $pid
|
||||
%if !0%{?_crossbuild}
|
||||
find -name fallback.o | xargs -r rm -vf
|
||||
cp fallback.c.build ncurses/fallback.c
|
||||
%endif
|
||||
make -C c++ etip.h
|
||||
make %{?_smp_mflags}
|
||||
sed -ri 's@^(LDFLAGS=)$@\1-L\\${libdir}@
|
||||
@ -605,8 +620,10 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
|
||||
--without-progs
|
||||
sleep 1
|
||||
kill $pid
|
||||
%if !0%{?_crossbuild}
|
||||
find -name fallback.o | xargs -r rm -vf
|
||||
cp fallback.c.build ncurses/fallback.c
|
||||
%endif
|
||||
make -C c++ etip.h
|
||||
make %{?_smp_mflags}
|
||||
# must not use %jobs here (would lead to: ln: ncurses.h already exists)
|
||||
@ -637,8 +654,10 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
|
||||
--without-progs
|
||||
sleep 1
|
||||
kill $pid
|
||||
%if !0%{?_crossbuild}
|
||||
find -name fallback.o | xargs -r rm -vf
|
||||
cp fallback.c.build ncurses/fallback.c
|
||||
%endif
|
||||
make -C c++ etip.h
|
||||
make %{?_smp_mflags}
|
||||
sed -ri 's@^(LDFLAGS=)$@\1-L\\${libdir}@
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cffefd505dec486f4e9e9086f22042bc7b4abd169dfbfb27b54a91e15300e39f
|
||||
size 158694
|
3
tack-1.07-20150606.tgz
Normal file
3
tack-1.07-20150606.tgz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0315f3acabb13d6a2e567eba57a49de6314775d90604739aa4526784cc19ce23
|
||||
size 207582
|
Loading…
Reference in New Issue
Block a user