From 0303a627b7bd84373bbde0ba06833d82739a6678fbca2e593e048707e5aeff6f Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Wed, 12 Oct 2011 13:26:58 +0000
Subject: [PATCH] Accepting request 86535 from
 home:uli_suse:branches:Base:System

- cross-build fixes: use %configure macro, use host's tic/tack
  for build, don't ldd tack

OBS-URL: https://build.opensuse.org/request/show/86535
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=48
---
 ncurses.changes |  6 ++++++
 ncurses.spec    | 24 +++++++++++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/ncurses.changes b/ncurses.changes
index 6eee1d0..e431b00 100644
--- a/ncurses.changes
+++ b/ncurses.changes
@@ -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
 
diff --git a/ncurses.spec b/ncurses.spec
index e36c8d0..490d95b 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -336,7 +336,7 @@ rm -vf mk-dlls.sh
     #
     touch --reference=README config.sub config.guess
     %{?suse_update_config:%{suse_update_config}}
-    ./configure --build ${RPM_ARCH}-suse-linux \
+    %configure \
 	--without-ada		\
 	--without-debug		\
 	--without-profile	\
@@ -409,9 +409,14 @@ rm -vf mk-dlls.sh
 	TERMINFO=$PWD/tmp
 	export TERMINFO
 	mkdir -p $TERMINFO
-	$PWD/../progs/tic -I -r -e $FALLBK ../misc/terminfo.src > terminfo.src
-	$PWD/../progs/tic -o $TERMINFO -s terminfo.src
-	sh -e ./tinfo/MKfallback.sh $TERMINFO ../misc/terminfo.src $PWD/../progs/tic ${FALLBK//,/ } > fallback.c
+%if 0%{?_crossbuild}
+export BUILD_TIC=/usr/bin/tic
+%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
 	unset  TERMINFO
 	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
     #
     pushd tack/
-%if 0%{?qemu_user_space_build:1}
-	echo "Skipping LDD test due to running under QEMU"
+%if 0%{?qemu_user_space_build:1}%{?_crossbuild}
+	echo "Skipping LDD test due to running under QEMU / cross-building"
 %else
 	ldd ./tack
 %endif
@@ -560,7 +565,12 @@ rm -vf mk-dlls.sh
     mkdir -p %{buildroot}%{_miscdir}
     cd ncurses/
 	{ 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
 	TERMCAP=termcap \
 	TERMINFO=%{buildroot}%{_datadir}/terminfo \