From mboxrd@z Thu Jan 1 00:00:00 1970 From: Zhigang Wang Subject: [PATCH] Date: Thu, 04 Feb 2010 18:40:20 +0800 Message-ID: <4B6AA414.8040702@oracle.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------080403050507050103020405" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------080403050507050103020405 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit hi, This patch remove the runtime download and compile of libconfig package. This package should be pre-installed by user manually. Xen should not do so much dirty things at compile time. Signed-off-by: Zhigang Wang thanks, zhigang --------------080403050507050103020405 Content-Type: text/x-patch; name="xen-remove-libconfig-runtime-download.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen-remove-libconfig-runtime-download.patch" --- xen-unstable/tools/libxl/Makefile.org 2010-02-04 05:29:02.000000000 -0500 +++ xen-unstable/tools/libxl/Makefile 2010-02-04 05:31:23.000000000 -0500 @@ -14,11 +14,6 @@ CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_ LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) -#LIBCONFIG_URL ?= http://www.hyperrealm.com/libconfig -LIBCONFIG_URL = $(XEN_EXTFILES_URL) -LIBCONFIG_SOURCE = libconfig-1.3.2 -LIBCONFIG_OUTPUT = $(LIBCONFIG_SOURCE)/.libs - LIBXL_OBJS-y = osdeps.o LIBXL_OBJS = flexarray.o libxl.o libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o libxl_internal.o xenguest.o libxl_utils.o $(LIBXL_OBJS-y) @@ -39,18 +34,11 @@ libxenlight.so.$(MAJOR).$(MINOR): $(LIBX libxenlight.a: $(LIBXL_OBJS) $(AR) rcs libxenlight.a $^ -$(LIBCONFIG_SOURCE).tar.gz: - $(WGET) $(LIBCONFIG_URL)/$@ - -$(LIBCONFIG_OUTPUT)/libconfig.so: $(LIBCONFIG_SOURCE).tar.gz - [ ! -d "$(LIBCONFIG_SOURCE)" ] && tar xzf $< - cd $(LIBCONFIG_SOURCE) && ./configure --prefix=$(PREFIX) --libdir=$(LIBDIR) --disable-cxx && $(MAKE) - -xl.o: $(LIBCONFIG_OUTPUT)/libconfig.so xl.c - $(CC) $(CFLAGS) -I$(LIBCONFIG_SOURCE) -c xl.c +xl.o: xl.c + $(CC) $(CFLAGS) -c xl.c -$(CLIENTS): xl.o libxenlight.so $(LIBCONFIG_OUTPUT)/libconfig.so - $(CC) $(LDFLAGS) -o $@ $< $(LIBS) -L . -lxenlight -L$(LIBCONFIG_OUTPUT) -lconfig +$(CLIENTS): xl.o libxenlight.so + $(CC) $(LDFLAGS) -o $@ $< $(LIBS) -L . -lxenlight -lconfig .PHONY: install install: all @@ -60,14 +48,11 @@ install: all ln -sf libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so $(INSTALL_DATA) libxenlight.a $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxl.h $(DESTDIR)$(INCLUDEDIR) - cd $(LIBCONFIG_SOURCE) && DESTDIR=$(DESTDIR) $(MAKE) install .PHONY: clean clean: $(RM) -f *.o *.so* *.a $(CLIENTS) $(DEPS) - $(RM) -rf $(LIBCONFIG_SOURCE) distclean: clean - $(RM) -f $(LIBCONFIG_SOURCE).tar.gz -include $(DEPS) --------------080403050507050103020405 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------080403050507050103020405--