Re: [Qemu-devel] [5194] Fix the build on non-Linux systems

[Anthony Liguori]

Blue Swirl wrote:
> On 9/11/08, C. W. Betts <address@hidden> wrote:
>   
> > Now it complains about missing symbols:
> > Undefined symbols:
> >   "_sigwaitinfo", referenced from:
> >       _sigwait_compat in compatfd.o
> > ld: symbol(s) not found
> > collect2: ld returned 1 exit status
> > make: *** [qemu-img] Error 1
> > This happened both when trying to compile qemu-img and qemu-nbd.
> >
> > On Sep 11, 2008, at 8:18 AM, Anthony Liguori wrote:
> >
> > Revision: 5194
> >
> > http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5194
> > Author:   aliguori
> > Date:     2008-09-11 14:18:56 +0000 (Thu, 11 Sep 2008)
> >
> > Log Message:
> > -----------
> > Fix the build on non-Linux systems
> >
> > It turns out, we're never reading from the signalfd() which is causing it to
> > remain readable forever.  I'll fix this up but I thought I'd commit this fix
> > in the interim.
> >     
>
> On OpenBSD the final link fails because pthread symbols are missing.
>   

Does this help:

Index: Makefile.target
===================================================================
--- Makefile.target    (revision 5193)
+++ Makefile.target    (working copy)
@@ -476,9 +476,13 @@
ifdef CONFIG_WIN32
OBJS+=block-raw-win32.o
else
-OBJS+=block-raw-posix.o compatfd.o
+OBJS+=block-raw-posix.o
endif

+ifdef CONFIG_AIO
+OBJS+=compatfd.o
+endif
+
LIBS+=-lz
ifdef CONFIG_ALSA
LIBS += -lasound
Index: Makefile
===================================================================
--- Makefile    (revision 5193)
+++ Makefile    (working copy)
@@ -177,9 +177,13 @@
ifdef CONFIG_WIN32
QEMU_IMG_BLOCK_OBJS += qemu-img-block-raw-win32.o
else
-QEMU_IMG_BLOCK_OBJS += nbd.o qemu-img-block-raw-posix.o compatfd.o
+QEMU_IMG_BLOCK_OBJS += nbd.o qemu-img-block-raw-posix.o
endif

+ifdef CONFIG_AIO
+QEMU_IMG_BLOCK_OBJS += compatfd.o
+endif
+
######################################################################

qemu-img$(EXESUF): qemu-img.o qemu-img-block.o $(QEMU_IMG_BLOCK_OBJS)
Index: configure
===================================================================
--- configure    (revision 5193)
+++ configure    (working copy)
@@ -1220,6 +1220,7 @@
fi
if test "$aio" = "yes" ; then
  echo "#define CONFIG_AIO 1" >> $config_h
+  echo "CONFIG_AIO=yes" >> $config_mak
fi

# XXX: suppress that

Regards,

Anthony Liguori