Re: [Xen-devel] [xen-unstable bisection] complete build-i386

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Wed, 2011-11-23 at 09:16 +0000, Ian Campbell wrote:
> On Wed, 2011-11-23 at 07:21 +0000, xen.org wrote:
> > branch xen-unstable
> > xen branch xen-unstable
> > job build-i386
> > test xen-build
> > 
> > Tree: xen http://xenbits.xen.org/staging/xen-unstable.hg
> > 
> > *** Found and reproduced problem changeset ***
> > 
> >   Bug is in tree:  xen http://xenbits.xen.org/staging/xen-unstable.hg
> >   Bug introduced:  4ecd3615e726
> >   Bug not present: 53bec838bb08
> > 
> > 
> >   changeset:   24184:4ecd3615e726
> >   tag:         tip
> >   user:        Ian Campbell <ian.campbell@xxxxxxxxxx>
> >   date:        Tue Nov 22 17:24:51 2011 +0000
> >       
> >       tools: use system installed libaio by default.
> 
> I somehow didn't see this in my testing

Testing with a .config with CONFIG_SYSTEM_LIBAIO=n in it can't have
helped. Oops!

>  but it's pretty obvious that
> tools/blktap needs the same treatment as tools/blktap2. Patch is
> forthcoming.

8<------------------------------------------------------

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1322041076 0
# Node ID c6286bb841ea754fb30319aea6c3d663a06dce19
# Parent  f883f41eb18ec2259afd8a2be43c7d3f2278ce93
tools: use system libaio for blktap1 as well.

24184:4ecd3615e726 missed this because I was accidentally testing with a
.config containing CONFIG_SYSTEM_LIBAIO=n. Tools tree now fully rebuilt
without this. There were no other issues.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

diff -r f883f41eb18e -r c6286bb841ea tools/blktap/drivers/Makefile
--- a/tools/blktap/drivers/Makefile     Wed Nov 23 09:20:52 2011 +0000
+++ b/tools/blktap/drivers/Makefile     Wed Nov 23 09:37:56 2011 +0000
@@ -3,7 +3,6 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 IBIN         = blktapctrl tapdisk
 QCOW_UTIL    = img2qcow qcow2raw qcow-create
-LIBAIO_DIR   = ../../libaio/src
 MEMSHR_DIR   = ../../memshr
 
 CFLAGS   += -Werror
@@ -11,7 +10,6 @@ CFLAGS   += -Wno-unused
 CFLAGS   += -I../lib
 CFLAGS   += $(CFLAGS_libxenctrl)
 CFLAGS   += $(CFLAGS_libxenstore)
-CFLAGS   += -I $(LIBAIO_DIR)
 CFLAGS   += -I $(MEMSHR_DIR)
 CFLAGS   += -D_GNU_SOURCE
 
@@ -29,8 +27,16 @@ CFLAGS += -DMEMSHR
 MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a
 endif
 
+ifneq ($(CONFIG_SYSTEM_LIBAIO),y)
+LIBAIO_DIR   = ../../libaio/src
+CFLAGS      += -I $(LIBAIO_DIR)
+AIOLIBS     := $(LIBAIO_DIR)/libaio.a
+else
+AIOLIBS     := -laio
+endif
+
 LDLIBS_blktapctrl := $(MEMSHRLIBS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) 
-L../lib -lblktap -lrt -lm -lpthread
-LDLIBS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz
+LDLIBS_img := $(AIOLIBS) $(CRYPT_LIB) -lpthread -lz
 
 BLK-OBJS-y  := block-aio.o
 BLK-OBJS-y  += block-sync.o



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