SHA256
3
0
forked from pool/ncurses
Dr. Werner Fink 2021-03-22 15:40:17 +00:00 committed by Git OBS Bridge
parent a3986b9a46
commit 42ed914213
2 changed files with 15 additions and 6 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 22 15:39:19 UTC 2021 - Dr. Werner Fink <werner@suse.de>
- Disable _Noreturn usage as it breaks build of e.g. dialog
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 22 08:37:32 UTC 2021 - Dr. Werner Fink <werner@suse.de> Mon Mar 22 08:37:32 UTC 2021 - Dr. Werner Fink <werner@suse.de>

View File

@ -197,7 +197,7 @@ Requires: terminfo-base
Provides: ncurses = %{version} Provides: ncurses = %{version}
Recommends: ncurses-utils = %{version} Recommends: ncurses-utils = %{version}
%description -n libncurses6 %description -n libncurses6
The ncurses library is used by many terminal applications for The ncurses library is used by many terminal applications for
controlling output to the screen and input from the user. controlling output to the screen and input from the user.
@ -337,18 +337,21 @@ mv tack-* tack
%patch1 -p0 -b .327x %patch1 -p0 -b .327x
%patch2 -p0 -b .hs %patch2 -p0 -b .hs
%patch0 -p0 -b .p0 %patch0 -p0 -b .p0
#
# Avoiud trouble with existing stdnorerturn.h
sed -ri 's/@HAVE_STDNORETURN_H@/0/' include/curses.h.in
%build %build
# #
# Do not run auto(re)conf here as this will fail later on ncurses # 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 # is build with special autoconf based on autoconf-2.13 at upstream
# #
%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
# #
# Note that there is a test if the system call poll(2) really works # 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 # 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). # 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 # 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. # would be used instead of redirecting stdout/stderr to a log file.
# #
@ -966,12 +969,12 @@ includedir5=%{_incdir}/ncurses5' "$pc"
libncursesw*) libncursesw*)
rm -f "${lnk}" rm -f "${lnk}"
echo '/* GNU ld script */' > ${lnk} echo '/* GNU ld script */' > ${lnk}
echo "INPUT(${lib} AS_NEEDED(-l%{soname_tinfo}))">> ${lnk} echo "INPUT(${lib} AS_NEEDED(-l%{soname_tinfo}))">> ${lnk}
;; ;;
libncurses*) libncurses*)
rm -f "${lnk}" rm -f "${lnk}"
echo '/* GNU ld script */' > ${lnk} echo '/* GNU ld script */' > ${lnk}
echo "INPUT(${lib} AS_NEEDED(-ltinfo))" >> ${lnk} echo "INPUT(${lib} AS_NEEDED(-ltinfo))" >> ${lnk}
;; ;;
libtinfo*) libtinfo*)
test -L "${lnk}" || continue test -L "${lnk}" || continue
@ -1135,7 +1138,7 @@ includedir5=%{_incdir}/ncurses5' "$pc"
# Install test binaries and, if exists, the manual pages # Install test binaries and, if exists, the manual pages
# #
pushd test pushd test
mv usr.back usr mv usr.back usr
(cd usr/; tar -cpSf - .) | tar -xpsSf - -C %{buildroot}%{_prefix} (cd usr/; tar -cpSf - .) | tar -xpsSf - -C %{buildroot}%{_prefix}
install -m 0755 %{S:8} %{buildroot}%{_libexecdir}/ncurses/ install -m 0755 %{S:8} %{buildroot}%{_libexecdir}/ncurses/
popd popd
@ -1143,6 +1146,7 @@ popd
%if 0%{?_crossbuild} %if 0%{?_crossbuild}
# No test here # No test here
%else %else
%check %check
LD_LIBRARY_PATH=%{buildroot}%{_libdir} LD_LIBRARY_PATH=%{buildroot}%{_libdir}
export LD_LIBRARY_PATH export LD_LIBRARY_PATH