forked from pool/ncurses
Accepting request 87526 from Base:System
- cross-build fixes: use %configure macro, use host's tic/tack for build, don't ldd tack (forwarded request 86535 from uli_suse) OBS-URL: https://build.opensuse.org/request/show/87526 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=42
This commit is contained in:
commit
b6582d8b7f
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Sep 30 15:46:17 UTC 2011 - uli@suse.com
|
||||||
|
|
||||||
|
- cross-build fixes: use %configure macro, use host's tic/tack
|
||||||
|
for build, don't ldd tack
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Sep 29 23:14:59 CEST 2011 - dmueller@suse.de
|
Thu Sep 29 23:14:59 CEST 2011 - dmueller@suse.de
|
||||||
|
|
||||||
|
24
ncurses.spec
24
ncurses.spec
@ -336,7 +336,7 @@ rm -vf mk-dlls.sh
|
|||||||
#
|
#
|
||||||
touch --reference=README config.sub config.guess
|
touch --reference=README config.sub config.guess
|
||||||
%{?suse_update_config:%{suse_update_config}}
|
%{?suse_update_config:%{suse_update_config}}
|
||||||
./configure --build ${RPM_ARCH}-suse-linux \
|
%configure \
|
||||||
--without-ada \
|
--without-ada \
|
||||||
--without-debug \
|
--without-debug \
|
||||||
--without-profile \
|
--without-profile \
|
||||||
@ -409,9 +409,14 @@ rm -vf mk-dlls.sh
|
|||||||
TERMINFO=$PWD/tmp
|
TERMINFO=$PWD/tmp
|
||||||
export TERMINFO
|
export TERMINFO
|
||||||
mkdir -p $TERMINFO
|
mkdir -p $TERMINFO
|
||||||
$PWD/../progs/tic -I -r -e $FALLBK ../misc/terminfo.src > terminfo.src
|
%if 0%{?_crossbuild}
|
||||||
$PWD/../progs/tic -o $TERMINFO -s terminfo.src
|
export BUILD_TIC=/usr/bin/tic
|
||||||
sh -e ./tinfo/MKfallback.sh $TERMINFO ../misc/terminfo.src $PWD/../progs/tic ${FALLBK//,/ } > fallback.c
|
%else
|
||||||
|
export BUILD_TIC=$PWD/../progs/tic
|
||||||
|
%endif
|
||||||
|
$BUILD_TIC -I -r -e $FALLBK ../misc/terminfo.src > terminfo.src
|
||||||
|
$BUILD_TIC -o $TERMINFO -s terminfo.src
|
||||||
|
sh -e ./tinfo/MKfallback.sh $TERMINFO ../misc/terminfo.src $BUILD_TIC ${FALLBK//,/ } > fallback.c
|
||||||
rm -rf $TERMINFO
|
rm -rf $TERMINFO
|
||||||
unset TERMINFO
|
unset TERMINFO
|
||||||
cp -p fallback.c ../fallback.c.backup
|
cp -p fallback.c ../fallback.c.backup
|
||||||
@ -439,8 +444,8 @@ rm -vf mk-dlls.sh
|
|||||||
# Check for tack program on base of above ncurses
|
# Check for tack program on base of above ncurses
|
||||||
#
|
#
|
||||||
pushd tack/
|
pushd tack/
|
||||||
%if 0%{?qemu_user_space_build:1}
|
%if 0%{?qemu_user_space_build:1}%{?_crossbuild}
|
||||||
echo "Skipping LDD test due to running under QEMU"
|
echo "Skipping LDD test due to running under QEMU / cross-building"
|
||||||
%else
|
%else
|
||||||
ldd ./tack
|
ldd ./tack
|
||||||
%endif
|
%endif
|
||||||
@ -560,7 +565,12 @@ rm -vf mk-dlls.sh
|
|||||||
mkdir -p %{buildroot}%{_miscdir}
|
mkdir -p %{buildroot}%{_miscdir}
|
||||||
cd ncurses/
|
cd ncurses/
|
||||||
{ echo "# See annotated version in %{_defaultdocdir}/ncurses/terminfo.src.bz2"
|
{ echo "# See annotated version in %{_defaultdocdir}/ncurses/terminfo.src.bz2"
|
||||||
$PWD/../progs/tic -C -r ../misc/terminfo.src | grep -E -v '^#'; } > termcap
|
%if 0%{?_crossbuild}
|
||||||
|
BUILD_TIC=/usr/bin/tic
|
||||||
|
%else
|
||||||
|
BUILD_TIC=$PWD/../progs/tic
|
||||||
|
%endif
|
||||||
|
$BUILD_TIC -C -r ../misc/terminfo.src | grep -E -v '^#'; } > termcap
|
||||||
# Gererate new termcap entries for various linux consoles
|
# Gererate new termcap entries for various linux consoles
|
||||||
TERMCAP=termcap \
|
TERMCAP=termcap \
|
||||||
TERMINFO=%{buildroot}%{_datadir}/terminfo \
|
TERMINFO=%{buildroot}%{_datadir}/terminfo \
|
||||||
|
Loading…
Reference in New Issue
Block a user