[Xen-devel] [PATCH 0 of 2] Make tools cross-friendly, try 2

[Aron Griffis <aron@xxxxxx>]

Hi,

This is an update of the patchset originally posted here:

http://lists.xensource.com/archives/html/xen-devel/2008-01/msg00620.html

This update includes changes suggested by Christoph's review,
in particular:
- fix vnconfig typo
- make the ldconfig logic better

That last fix actually behaves a bit differently than
before, but I think it's better to alert the user than
assume we can create the cache.  Here's the delta:

        # This relatively common in a sys-root; libs are installed but
-       # ldconfig hasn't run there, so ldconfig -p won't work.  We can
-       # only fix it if it's writeable.
-       [ "$OS" != Linux ] || \
-       [ -f "$CROSS_SYS_ROOT/etc/ld.so.cache" ] || \
-       ldconfig -r "$CROSS_SYS_ROOT" && \
+       # ldconfig hasn't run there, so ldconfig -p won't work.
+       if [ "$OS" = Linux -a ! -f "$CROSS_SYS_ROOT/etc/ld.so.cache" ]; then
+           echo "Please run ldconfig -r \"$CROSS_SYS_ROOT\" to generate 
ld.so.cache"
+           # fall through; ldconfig test below should fail
+       fi
        ldconfig -p ${CROSS_SYS_ROOT+-r "$CROSS_SYS_ROOT"} | grep -Fq "$1"
        return $?

I did not revert the SunOS test.  I have a high degree of
confidence that it's correct, and IMHO it's better to be
consistent.

Thanks,
Aron

17 files changed, 160 insertions(+), 224 deletions(-)
tools/Makefile                  |   15 +++++-
tools/check/check_brctl         |   24 ++---------
tools/check/check_crypto_lib    |   20 +--------
tools/check/check_curl          |   41 +++---------------
tools/check/check_iproute       |   25 +++--------
tools/check/check_openssl_devel |   12 -----
tools/check/check_python        |   11 -----
tools/check/check_python_devel  |   11 -----
tools/check/check_python_xml    |    9 +---
tools/check/check_udev          |   31 +++-----------
tools/check/check_x11_devel     |   15 +-----
tools/check/check_xgettext      |   12 -----
tools/check/check_xml2          |   34 ++-------------
tools/check/check_zlib_devel    |   12 -----
tools/check/check_zlib_lib      |   18 +-------
tools/check/chk                 |    9 +---
tools/check/funcs.sh            |   85 +++++++++++++++++++++++++++++++++++++++



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel