[Xen-changelog] [xen-unstable] libxenguest: Fix libbz2/liblzma dependency computation.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1250803576 -3600
# Node ID 7dad2e23bf892a6be9244265e028a9899503e664
# Parent  a687c4d35fdd00c89c097d691c3039e07f737a1d
libxenguest: Fix libbz2/liblzma dependency computation.

 1. Create an empty dep file if neither lib is installed
 2. Forcibly disable support for libs if building minios

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/libxc/Makefile |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

diff -r a687c4d35fdd -r 7dad2e23bf89 tools/libxc/Makefile
--- a/tools/libxc/Makefile      Thu Aug 20 22:12:25 2009 +0100
+++ b/tools/libxc/Makefile      Thu Aug 20 22:26:16 2009 +0100
@@ -151,10 +151,14 @@ libxenguest.so.$(MAJOR): libxenguest.so.
 libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
        ln -sf $< $@
 
+ifeq ($(CONFIG_MiniOS),y)
+.zlib.deps:
+       echo >$@
+else
 .zlib.deps:
        @(set -e;                                       \
           . ../check/funcs.sh;                         \
-         rm -f $@.new;                                 \
+         echo >$@.new;                                 \
          if has_header bzlib.h; then                   \
             echo "-DHAVE_BZLIB" >>$@.new;              \
            echo "-lbz2" >>$@.new;                      \
@@ -166,6 +170,7 @@ libxenguest.so.$(MAJOR): libxenguest.so.
            echo " - LZMA decompression supported";     \
          fi;                                           \
          mv $@.new $@)
+endif
 
 xc_dom_bzimageloader.o: .zlib.deps
 xc_dom_bzimageloader.o: CFLAGS += $(shell grep D .zlib.deps)

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