From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1GlZTX-0003eN-UG for qemu-devel@nongnu.org; Sat, 18 Nov 2006 18:19:56 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1GlZTX-0003e1-8M for qemu-devel@nongnu.org; Sat, 18 Nov 2006 18:19:55 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GlZTX-0003dy-3u for qemu-devel@nongnu.org; Sat, 18 Nov 2006 18:19:55 -0500 Received: from [66.249.92.173] (helo=ug-out-1314.google.com) by monty-python.gnu.org with esmtp (Exim 4.52) id 1GlZTX-0004rb-0P for qemu-devel@nongnu.org; Sat, 18 Nov 2006 18:19:55 -0500 Received: by ug-out-1314.google.com with SMTP id j40so856647ugd for ; Sat, 18 Nov 2006 15:19:53 -0800 (PST) From: "Andrzej Zaborowski" Date: Sun, 19 Nov 2006 02:20:54 +0100 Message-Id: <1163899254733-git-send-email-balrog@zabor.org> Sender: andrzej zaborowski Subject: [Qemu-devel] FreeBSD compile fix. Reply-To: balrogg@gmail.com, qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel I needed the following change to build under FreeBSD 6.0. --- Makefile | 8 +------- Makefile.target | 3 ++- configure | 7 +++++++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index f0a8199..568bd5b 100644 --- a/Makefile +++ b/Makefile @@ -25,13 +25,7 @@ else DOCS= endif -ifndef CONFIG_DARWIN -ifndef CONFIG_WIN32 -ifndef CONFIG_SOLARIS -LIBS+=-lrt -endif -endif -endif +LIBS+=$(AIOLIBS) all: $(TOOLS) $(DOCS) recurse-all diff --git a/Makefile.target b/Makefile.target index 63dba83..9c4272a 100644 --- a/Makefile.target +++ b/Makefile.target @@ -406,6 +406,7 @@ VL_OBJS+=$(addprefix slirp/, $(SLIRP_OBJ endif VL_LDFLAGS= +VL_LIBS=$(AIOLIBS) # specific flags are needed for non soft mmu emulator ifdef CONFIG_STATIC VL_LDFLAGS+=-static @@ -416,7 +417,7 @@ endif ifndef CONFIG_DARWIN ifndef CONFIG_WIN32 ifndef CONFIG_SOLARIS -VL_LIBS=-lutil -lrt +VL_LIBS+=-lutil endif endif endif diff --git a/configure b/configure index 84f8ee0..f0f9fdb 100755 --- a/configure +++ b/configure @@ -150,6 +150,12 @@ if [ "$solaris" = "yes" ] ; then solarisrev=`uname -r | cut -f2 -d.` fi +if [ "$bsd" = "yes" -o "$solaris" = "yes" -o "$mingw32" = "yes" ] ; then + AIOLIBS= +else + AIOLIBS="-lrt" +fi + # find source path source_path=`dirname "$0"` if [ -z "$source_path" ]; then @@ -588,6 +594,7 @@ echo "STRIP=$strip -s -R .comment -R .no echo "CFLAGS=$CFLAGS" >> $config_mak echo "LDFLAGS=$LDFLAGS" >> $config_mak echo "EXESUF=$EXESUF" >> $config_mak +echo "AIOLIBS=$AIOLIBS" >> $config_mak if test "$cpu" = "i386" ; then echo "ARCH=i386" >> $config_mak echo "#define HOST_I386 1" >> $config_h -- 1.4.3.2