forked from pool/ncurses
Update to ncurses-6.2-20200829
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=504
This commit is contained in:
Dr. Werner Fink
Git OBS Bridge
parent
82e1c12567
commit
938360d730
39
awk-scripts.patch
Normal file
39
awk-scripts.patch
Normal file
@ -0,0 +1,39 @@
|
||||
---
|
||||
mk-1st.awk | 2 +-
|
||||
mk-2nd.awk | 2 +-
|
||||
mk-hdr.awk | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
--- mk-1st.awk
|
||||
+++ mk-1st.awk 2020-08-31 13:43:20.574386946 +0000
|
||||
@@ -262,7 +262,7 @@ function install_dll(directory,filename)
|
||||
function in_subset(value) {
|
||||
value = " " value " ";
|
||||
check = subset;
|
||||
- sub(" .*$", "", check);
|
||||
+ sub(" *$", "", check);
|
||||
gsub("[+]", " ", check);
|
||||
check = " " check " ";
|
||||
return index(check,value);
|
||||
--- mk-2nd.awk
|
||||
+++ mk-2nd.awk 2020-08-31 13:43:26.250284434 +0000
|
||||
@@ -56,7 +56,7 @@
|
||||
function in_subset(value) {
|
||||
value = " " value " ";
|
||||
check = subset;
|
||||
- sub(" .*$", "", check);
|
||||
+ sub(" *$", "", check);
|
||||
gsub("[+]", " ", check);
|
||||
check = " " check " ";
|
||||
return index(check,value);
|
||||
--- mk-hdr.awk
|
||||
+++ mk-hdr.awk 2020-08-31 13:43:32.146177950 +0000
|
||||
@@ -42,7 +42,7 @@ function basename(path) {
|
||||
function in_subset(value) {
|
||||
value = " " value " ";
|
||||
check = subset;
|
||||
- sub(" .*$", "", check);
|
||||
+ sub(" *$", "", check);
|
||||
gsub("[+]", " ", check);
|
||||
check = " " check " ";
|
||||
return index(check,value);
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0b0eaf9127321b02a3cf806aaa8a632753afc8ceaaea2091381b48357def6c12
|
||||
size 761807
|
||||
oid sha256:d18ed32b226a3229686e553ed41f89461aca0a17b6c3d998272a7dab3fc7adca
|
||||
size 914261
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
---
|
||||
aclocal.m4 | 40 ++++++------
|
||||
configure | 41 +++++++-----
|
||||
configure | 40 ++++++------
|
||||
include/curses.h.in | 3
|
||||
include/termcap.h.in | 2
|
||||
include/tic.h | 4 -
|
||||
@ -18,10 +18,10 @@
|
||||
ncurses/tinfo/read_termcap.c | 21 ++++--
|
||||
progs/Makefile.in | 4 -
|
||||
test/test.priv.h | 4 -
|
||||
19 files changed, 250 insertions(+), 79 deletions(-)
|
||||
19 files changed, 249 insertions(+), 79 deletions(-)
|
||||
|
||||
--- aclocal.m4
|
||||
+++ aclocal.m4 2020-08-17 08:13:47.804152211 +0000
|
||||
+++ aclocal.m4 2020-08-31 12:06:53.682411288 +0000
|
||||
@@ -617,7 +617,7 @@ AC_MSG_CHECKING([for size of bool])
|
||||
AC_CACHE_VAL(cf_cv_type_of_bool,[
|
||||
rm -f cf_test.out
|
||||
@ -31,7 +31,7 @@
|
||||
#include <stdio.h>
|
||||
|
||||
#if defined(__cplusplus)
|
||||
@@ -5409,12 +5409,15 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
@@ -5476,12 +5476,15 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
echo '? missing rename for '\$cf_source
|
||||
cf_target="\$cf_source"
|
||||
fi
|
||||
@ -49,7 +49,7 @@
|
||||
sed -f $cf_man_alias \\
|
||||
CF_EOF
|
||||
|
||||
@@ -5424,7 +5427,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
@@ -5491,7 +5494,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
CF_EOF
|
||||
else
|
||||
cat >>$cf_edit_man <<CF_EOF
|
||||
@ -58,7 +58,7 @@
|
||||
CF_EOF
|
||||
fi
|
||||
|
||||
@@ -5464,7 +5467,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
@@ -5531,7 +5534,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
mv \$TMP.$cf_so_strip \$TMP
|
||||
fi
|
||||
fi
|
||||
@ -67,7 +67,7 @@
|
||||
CF_EOF
|
||||
fi
|
||||
|
||||
@@ -5473,23 +5476,23 @@ case "$MANPAGE_FORMAT" in
|
||||
@@ -5540,23 +5543,23 @@ case "$MANPAGE_FORMAT" in
|
||||
cat >>$cf_edit_man <<CF_EOF
|
||||
if test \$form = format ; then
|
||||
# BSDI installs only .0 suffixes in the cat directories
|
||||
@ -97,7 +97,7 @@
|
||||
for cf_alias in \$aliases
|
||||
do
|
||||
if test \$section = 1 ; then
|
||||
@@ -5498,7 +5501,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
@@ -5565,7 +5568,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
|
||||
if test "$MANPAGE_SYMLINKS" = yes ; then
|
||||
if test -f \$cf_alias\${suffix} ; then
|
||||
@ -106,7 +106,7 @@
|
||||
then
|
||||
continue
|
||||
fi
|
||||
@@ -5508,18 +5511,18 @@ CF_EOF
|
||||
@@ -5575,18 +5578,18 @@ CF_EOF
|
||||
case "x$LN_S" in
|
||||
(*-f)
|
||||
cat >>$cf_edit_man <<CF_EOF
|
||||
@ -128,7 +128,7 @@
|
||||
echo ".so \$cf_source" >\$TMP
|
||||
CF_EOF
|
||||
if test -n "$cf_compress" ; then
|
||||
@@ -5539,9 +5542,9 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
@@ -5606,9 +5609,9 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
)
|
||||
)
|
||||
elif test \$verb = removing ; then
|
||||
@ -141,7 +141,7 @@
|
||||
)
|
||||
test -d \$cf_subdir\${section} &&
|
||||
test -n "\$aliases" && (
|
||||
@@ -5561,6 +5564,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
@@ -5628,6 +5631,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
# echo ".hy 0"
|
||||
cat \$TMP
|
||||
fi
|
||||
@ -150,8 +150,8 @@
|
||||
esac
|
||||
done
|
||||
--- configure
|
||||
+++ configure 2020-08-17 08:13:47.808152141 +0000
|
||||
@@ -5628,7 +5628,7 @@ echo $ECHO_N "checking for an rpath opti
|
||||
+++ configure 2020-08-31 12:06:53.686411216 +0000
|
||||
@@ -5636,7 +5636,7 @@ echo $ECHO_N "checking for an rpath opti
|
||||
fi
|
||||
;;
|
||||
(linux*|gnu*|k*bsd*-gnu|freebsd*)
|
||||
@ -160,7 +160,7 @@
|
||||
;;
|
||||
(openbsd[2-9].*|mirbsd*)
|
||||
LD_RPATH_OPT="-Wl,-rpath,"
|
||||
@@ -14393,12 +14393,15 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
@@ -14401,12 +14401,15 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
echo '? missing rename for '\$cf_source
|
||||
cf_target="\$cf_source"
|
||||
fi
|
||||
@ -178,7 +178,7 @@
|
||||
sed -f $cf_man_alias \\
|
||||
CF_EOF
|
||||
|
||||
@@ -14408,7 +14411,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
@@ -14416,7 +14419,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
CF_EOF
|
||||
else
|
||||
cat >>$cf_edit_man <<CF_EOF
|
||||
@ -187,7 +187,7 @@
|
||||
CF_EOF
|
||||
fi
|
||||
|
||||
@@ -14448,7 +14451,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
@@ -14456,7 +14459,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
mv \$TMP.$cf_so_strip \$TMP
|
||||
fi
|
||||
fi
|
||||
@ -196,7 +196,7 @@
|
||||
CF_EOF
|
||||
fi
|
||||
|
||||
@@ -14457,23 +14460,23 @@ case "$MANPAGE_FORMAT" in
|
||||
@@ -14465,23 +14468,23 @@ case "$MANPAGE_FORMAT" in
|
||||
cat >>$cf_edit_man <<CF_EOF
|
||||
if test \$form = format ; then
|
||||
# BSDI installs only .0 suffixes in the cat directories
|
||||
@ -226,7 +226,7 @@
|
||||
for cf_alias in \$aliases
|
||||
do
|
||||
if test \$section = 1 ; then
|
||||
@@ -14482,7 +14485,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
@@ -14490,7 +14493,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
|
||||
if test "$MANPAGE_SYMLINKS" = yes ; then
|
||||
if test -f \$cf_alias\${suffix} ; then
|
||||
@ -235,7 +235,7 @@
|
||||
then
|
||||
continue
|
||||
fi
|
||||
@@ -14492,18 +14495,18 @@ CF_EOF
|
||||
@@ -14500,18 +14503,18 @@ CF_EOF
|
||||
case "x$LN_S" in
|
||||
(*-f)
|
||||
cat >>$cf_edit_man <<CF_EOF
|
||||
@ -257,7 +257,7 @@
|
||||
echo ".so \$cf_source" >\$TMP
|
||||
CF_EOF
|
||||
if test -n "$cf_compress" ; then
|
||||
@@ -14523,9 +14526,9 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
@@ -14531,9 +14534,9 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
)
|
||||
)
|
||||
elif test \$verb = removing ; then
|
||||
@ -270,7 +270,7 @@
|
||||
)
|
||||
test -d \$cf_subdir\${section} &&
|
||||
test -n "\$aliases" && (
|
||||
@@ -14545,6 +14548,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
@@ -14553,6 +14556,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
# echo ".hy 0"
|
||||
cat \$TMP
|
||||
fi
|
||||
@ -278,16 +278,8 @@
|
||||
;;
|
||||
esac
|
||||
done
|
||||
@@ -26004,6 +26008,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}
|
||||
--- include/curses.h.in
|
||||
+++ include/curses.h.in 2020-08-17 08:13:47.808152141 +0000
|
||||
+++ include/curses.h.in 2020-08-31 12:06:53.686411216 +0000
|
||||
@@ -186,6 +186,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
|
||||
typedef @cf_cv_typeof_mmask_t@ mmask_t;
|
||||
#endif
|
||||
@ -299,7 +291,7 @@
|
||||
* We need FILE, etc. Include this before checking any feature symbols.
|
||||
*/
|
||||
--- include/termcap.h.in
|
||||
+++ include/termcap.h.in 2020-08-17 08:13:47.808152141 +0000
|
||||
+++ include/termcap.h.in 2020-08-31 12:06:53.686411216 +0000
|
||||
@@ -47,6 +47,8 @@ extern "C"
|
||||
{
|
||||
#endif /* __cplusplus */
|
||||
@ -310,7 +302,7 @@
|
||||
|
||||
#undef NCURSES_OSPEED
|
||||
--- include/tic.h
|
||||
+++ include/tic.h 2020-08-17 08:13:47.808152141 +0000
|
||||
+++ include/tic.h 2020-08-31 12:06:53.686411216 +0000
|
||||
@@ -237,12 +237,12 @@ struct user_table_entry
|
||||
*/
|
||||
|
||||
@ -327,7 +319,7 @@
|
||||
#define CANCELLED_STRING (char *)(-1)
|
||||
|
||||
--- man/man_db.renames
|
||||
+++ man/man_db.renames 2020-08-17 08:13:47.808152141 +0000
|
||||
+++ man/man_db.renames 2020-08-31 12:06:53.686411216 +0000
|
||||
@@ -164,6 +164,7 @@ term.7 term.7
|
||||
term_variables.3x terminfo_variables.3ncurses
|
||||
terminfo.5 terminfo.5
|
||||
@ -345,7 +337,7 @@
|
||||
#
|
||||
getty.1 getty.8
|
||||
--- man/ncurses.3x
|
||||
+++ man/ncurses.3x 2020-08-17 08:13:47.808152141 +0000
|
||||
+++ man/ncurses.3x 2020-08-31 12:06:53.686411216 +0000
|
||||
@@ -140,6 +140,10 @@ after the shell environment variable \fB
|
||||
[See \fBterminfo\fR(\*n) for further details.]
|
||||
.SS Datatypes
|
||||
@ -358,7 +350,7 @@
|
||||
called \fIwindows\fR, which can be thought of as two-dimensional
|
||||
arrays of characters representing all or part of a CRT screen.
|
||||
--- misc/gen-pkgconfig.in
|
||||
+++ misc/gen-pkgconfig.in 2020-08-17 08:13:47.808152141 +0000
|
||||
+++ misc/gen-pkgconfig.in 2020-08-31 12:06:53.686411216 +0000
|
||||
@@ -92,6 +92,9 @@ do
|
||||
-specs*) # ignore linker specs-files which were used to build library
|
||||
continue
|
||||
@ -399,7 +391,7 @@
|
||||
|
||||
if [ $name = $MAIN_LIBRARY ]
|
||||
--- misc/terminfo.src
|
||||
+++ misc/terminfo.src 2020-08-17 08:13:47.812152071 +0000
|
||||
+++ misc/terminfo.src 2020-08-31 12:06:53.690411143 +0000
|
||||
@@ -305,7 +305,9 @@ dumb|80-column dumb tty,
|
||||
am,
|
||||
cols#80,
|
||||
@ -783,8 +775,8 @@
|
||||
s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
|
||||
ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
|
||||
--- ncurses/Makefile.in
|
||||
+++ ncurses/Makefile.in 2020-08-17 08:13:47.812152071 +0000
|
||||
@@ -230,7 +230,7 @@ $(DESTDIR)$(libdir) :
|
||||
+++ ncurses/Makefile.in 2020-08-31 12:06:53.690411143 +0000
|
||||
@@ -231,7 +231,7 @@ $(DESTDIR)$(libdir) :
|
||||
../lib : ; mkdir $@
|
||||
|
||||
./fallback.c : $(tinfo)/MKfallback.sh
|
||||
@ -794,8 +786,8 @@
|
||||
./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
|
||||
$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
|
||||
--- ncurses/curses.priv.h
|
||||
+++ ncurses/curses.priv.h 2020-08-17 08:13:47.812152071 +0000
|
||||
@@ -2250,6 +2250,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
|
||||
+++ ncurses/curses.priv.h 2020-08-31 12:06:53.690411143 +0000
|
||||
@@ -2278,6 +2278,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
|
||||
extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
|
||||
extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t);
|
||||
extern NCURSES_EXPORT(int) _nc_access (const char *, int);
|
||||
@ -805,7 +797,7 @@
|
||||
extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
|
||||
extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
|
||||
--- ncurses/run_cmd.sh
|
||||
+++ ncurses/run_cmd.sh 2020-08-17 08:13:47.812152071 +0000
|
||||
+++ ncurses/run_cmd.sh 2020-08-31 12:06:53.690411143 +0000
|
||||
@@ -0,0 +1,11 @@
|
||||
+#!/bin/sh
|
||||
+
|
||||
@ -819,7 +811,7 @@
|
||||
+
|
||||
+exec ${1+"$@"}
|
||||
--- ncurses/tinfo/MKfallback.sh
|
||||
+++ ncurses/tinfo/MKfallback.sh 2020-08-17 08:33:39.543183822 +0000
|
||||
+++ ncurses/tinfo/MKfallback.sh 2020-08-31 12:06:53.690411143 +0000
|
||||
@@ -74,6 +74,12 @@ else
|
||||
tmp_info=
|
||||
fi
|
||||
@ -852,7 +844,7 @@
|
||||
done
|
||||
|
||||
--- ncurses/tinfo/access.c
|
||||
+++ ncurses/tinfo/access.c 2020-08-17 08:13:47.812152071 +0000
|
||||
+++ ncurses/tinfo/access.c 2020-08-31 12:06:53.690411143 +0000
|
||||
@@ -31,6 +31,10 @@
|
||||
* Author: Thomas E. Dickey *
|
||||
****************************************************************************/
|
||||
@ -896,7 +888,7 @@
|
||||
_nc_access(const char *path, int mode)
|
||||
{
|
||||
--- ncurses/tinfo/lib_setup.c
|
||||
+++ ncurses/tinfo/lib_setup.c 2020-08-17 08:13:47.812152071 +0000
|
||||
+++ ncurses/tinfo/lib_setup.c 2020-08-31 12:06:53.690411143 +0000
|
||||
@@ -605,6 +605,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
|
||||
} else if ((value = tigetnum("U8")) >= 0) {
|
||||
result = value; /* use extension feature */
|
||||
@ -908,7 +900,7 @@
|
||||
result = 1; /* always broken */
|
||||
} else if (strstr(env, "screen") != 0
|
||||
--- ncurses/tinfo/read_entry.c
|
||||
+++ ncurses/tinfo/read_entry.c 2020-08-17 08:13:47.812152071 +0000
|
||||
+++ ncurses/tinfo/read_entry.c 2020-08-31 12:06:53.690411143 +0000
|
||||
@@ -552,6 +552,7 @@ _nc_read_file_entry(const char *const fi
|
||||
FILE *fp = 0;
|
||||
int code;
|
||||
@ -926,7 +918,7 @@
|
||||
return (code);
|
||||
}
|
||||
--- ncurses/tinfo/read_termcap.c
|
||||
+++ ncurses/tinfo/read_termcap.c 2020-08-17 08:13:47.812152071 +0000
|
||||
+++ ncurses/tinfo/read_termcap.c 2020-08-31 12:06:53.690411143 +0000
|
||||
@@ -323,14 +323,18 @@ _nc_getent(
|
||||
*/
|
||||
if (fd >= 0) {
|
||||
@ -973,7 +965,7 @@
|
||||
}
|
||||
if (copied != 0)
|
||||
--- progs/Makefile.in
|
||||
+++ progs/Makefile.in 2020-08-17 08:13:47.812152071 +0000
|
||||
+++ progs/Makefile.in 2020-08-31 12:06:53.690411143 +0000
|
||||
@@ -101,7 +101,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS)
|
||||
CFLAGS_NORMAL = $(CCFLAGS) -DNCURSES_STATIC
|
||||
CFLAGS_DEBUG = $(CCFLAGS) -DNCURSES_STATIC @CC_G_OPT@ -DTRACE
|
||||
@ -993,8 +985,8 @@
|
||||
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
|
||||
|
||||
--- test/test.priv.h
|
||||
+++ test/test.priv.h 2020-08-17 08:13:47.812152071 +0000
|
||||
@@ -1005,12 +1005,12 @@ extern char *_nc_strstr(const char *, co
|
||||
+++ test/test.priv.h 2020-08-31 12:06:53.690411143 +0000
|
||||
@@ -1012,12 +1012,12 @@ extern char *_nc_strstr(const char *, co
|
||||
#endif
|
||||
|
||||
/* out-of-band values for representing absent capabilities */
|
||||
|
||||
@ -1,3 +1,25 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 31 13:56:18 UTC 2020 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Add patch awk-scripts.patch as workaround for patch 20200829
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 31 08:47:56 UTC 2020 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Add ncurses patch 20200829
|
||||
+ remove a redundant NCURSES_EXPORT as a build-fix for "Maarten
|
||||
Anonymous".
|
||||
+ merge/adapt in-progress work by Juergen Pfeifer for new version of
|
||||
win32-driver.
|
||||
+ modify configure script, moving gcc -Werror options to EXTRA_CFLAGS
|
||||
to avoid breaking configure-checks (adapted from ongoing work on
|
||||
mawk and lynx).
|
||||
> errate for terminfo.src (report by Florian Weimer):
|
||||
+ correct icl6404 csr
|
||||
+ correct ti916 cup
|
||||
+ improve ndr9500
|
||||
- Refresh patch ncurses-6.2.dif
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 24 06:47:44 UTC 2020 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
|
||||
12
ncurses.spec
12
ncurses.spec
@ -48,6 +48,7 @@ BuildRequires: gpm-devel
|
||||
%else
|
||||
BuildRequires: gpm
|
||||
%endif
|
||||
BuildRequires: makedepend
|
||||
%define terminfo() %{_datadir}/%{0}/%{1}
|
||||
%define tabset() %{_datadir}/%{0}/%{1}
|
||||
# bug437293
|
||||
@ -78,6 +79,7 @@ Source7: baselibs.conf
|
||||
Patch0: ncurses-6.2.dif
|
||||
Patch1: ncurses-5.9-ibm327x.dif
|
||||
Patch2: ncurses-5.7-tack.dif
|
||||
Patch3: awk-scripts.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%global _miscdir %{_datadir}/misc
|
||||
%global _incdir %{_includedir}
|
||||
@ -314,9 +316,14 @@ tar -xzf %{S:5}
|
||||
mv tack-* tack
|
||||
%patch1 -p0 -b .327x
|
||||
%patch2 -p0 -b .hs
|
||||
%patch3 -p0 -b .xyz
|
||||
%patch0 -p0 -b .p0
|
||||
|
||||
%build
|
||||
#
|
||||
# Do not run auto(re)conf here as this will fail later on ncurses
|
||||
# is build with special autoconf based on autoconf-2.13 at upstream
|
||||
#
|
||||
%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
|
||||
#
|
||||
# Note that there is a test if the system call poll(2) really works
|
||||
@ -534,6 +541,7 @@ mv tack-* tack
|
||||
# It has been verified several times that this works.
|
||||
#
|
||||
c=$(grep '^ *$ *\./configure' config.log)
|
||||
make depend
|
||||
make -C c++ etip.h
|
||||
make %{?_smp_mflags}
|
||||
#
|
||||
@ -580,6 +588,7 @@ mv tack-* tack
|
||||
#
|
||||
find -name fallback.o -print -delete
|
||||
cp fallback.c.build ncurses/fallback.c
|
||||
make depend
|
||||
make -C c++ etip.h
|
||||
make %{?_smp_mflags}
|
||||
%else
|
||||
@ -675,6 +684,7 @@ mv tack-* tack
|
||||
find -name fallback.o -print -delete
|
||||
cp fallback.c.build ncurses/fallback.c
|
||||
%endif
|
||||
make depend
|
||||
make -C c++ etip.h
|
||||
make %{?_smp_mflags}
|
||||
sed -ri 's@^(LDFLAGS=)$@\1-L\\${libdir}@
|
||||
@ -736,6 +746,7 @@ includedir5=%{_incdir}/ncurses5' "$pc"
|
||||
find -name fallback.o -print -delete
|
||||
cp fallback.c.build ncurses/fallback.c
|
||||
%endif
|
||||
make depend
|
||||
make -C c++ etip.h
|
||||
make %{?_smp_mflags}
|
||||
# must not use %jobs here (would lead to: ln: ncurses.h already exists)
|
||||
@ -809,6 +820,7 @@ includedir5=%{_incdir}/ncurses5' "$pc"
|
||||
find -name fallback.o -print -delete
|
||||
cp fallback.c.build ncurses/fallback.c
|
||||
%endif
|
||||
make depend
|
||||
make -C c++ etip.h
|
||||
make %{?_smp_mflags}
|
||||
sed -ri 's@^(LDFLAGS=)$@\1-L\\${libdir}@
|
||||
|
||||
Loading…
Reference in New Issue
Block a user