Hello community,

here is the log from the commit of package ncurses for openSUSE:Factory
checked in at Thu Oct 13 00:00:53 CEST 2011.



--------
--- openSUSE:Factory/ncurses/ncurses.changes    2011-10-02 10:20:32.000000000 
+0200
+++ /mounts/work_src_done/STABLE/ncurses/ncurses.changes        2011-09-30 
17:47:26.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Sep 30 15:46:17 UTC 2011 - [email protected]
+
+- cross-build fixes: use %configure macro, use host's tic/tack
+  for build, don't ldd tack
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ncurses.spec ++++++
--- /var/tmp/diff_new_pack.8HGnqm/_old  2011-10-13 00:00:45.000000000 +0200
+++ /var/tmp/diff_new_pack.8HGnqm/_new  2011-10-13 00:00:45.000000000 +0200
@@ -336,7 +336,7 @@
     #
     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 @@
        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 @@
     # 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 @@
     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 \

continue with "q"...



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to