From: Matt Evans <matt@ozlabs.org>
To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org
Cc: penberg@kernel.org, asias.hejun@gmail.com,
levinsasha928@gmail.com, gorcunov@gmail.com
Subject: [PATCH V2 03/23] kvm tools: Re-arrange Makefile to heed CFLAGS before
Date: Fri, 09 Dec 2011 06:52:45 +0000 [thread overview]
Message-ID: <4EE1B03D.9090409@ozlabs.org> (raw)
In-Reply-To: <cover.1323413420.git.matt@ozlabs.org>
The checks for optional libraries build code to perform the tests, so should
respect certain CFLAGS -- in particular, -m64 so we check for 64bit libraries if
they're required.
Signed-off-by: Matt Evans <matt@ozlabs.org>
---
tools/kvm/Makefile | 86 ++++++++++++++++++++++++++-------------------------
1 files changed, 44 insertions(+), 42 deletions(-)
diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile
index f85a154..009a6ba 100644
--- a/tools/kvm/Makefile
+++ b/tools/kvm/Makefile
@@ -85,48 +85,6 @@ OBJS += hw/vesa.o
OBJS += hw/pci-shmem.o
OBJS += kvm-ipc.o
-FLAGS_BFD := $(CFLAGS) -lbfd
-has_bfd := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD))
-ifeq ($(has_bfd),y)
- CFLAGS += -DCONFIG_HAS_BFD
- OBJS += symbol.o
- LIBS += -lbfd
-endif
-
-FLAGS_VNCSERVER := $(CFLAGS) -lvncserver
-has_vncserver := $(call try-cc,$(SOURCE_VNCSERVER),$(FLAGS_VNCSERVER))
-ifeq ($(has_vncserver),y)
- OBJS += ui/vnc.o
- CFLAGS += -DCONFIG_HAS_VNCSERVER
- LIBS += -lvncserver
-endif
-
-FLAGS_SDL := $(CFLAGS) -lSDL
-has_SDL := $(call try-cc,$(SOURCE_SDL),$(FLAGS_SDL))
-ifeq ($(has_SDL),y)
- OBJS += ui/sdl.o
- CFLAGS += -DCONFIG_HAS_SDL
- LIBS += -lSDL
-endif
-
-FLAGS_ZLIB := $(CFLAGS) -lz
-has_ZLIB := $(call try-cc,$(SOURCE_ZLIB),$(FLAGS_ZLIB))
-ifeq ($(has_ZLIB),y)
- CFLAGS += -DCONFIG_HAS_ZLIB
- LIBS += -lz
-endif
-
-FLAGS_AIO := $(CFLAGS) -laio
-has_AIO := $(call try-cc,$(SOURCE_AIO),$(FLAGS_AIO))
-ifeq ($(has_AIO),y)
- CFLAGS += -DCONFIG_HAS_AIO
- LIBS += -laio
-endif
-
-LIBS += -lrt
-LIBS += -lpthread
-LIBS += -lutil
-
# Additional ARCH settings for x86
ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
-e s/arm.*/arm/ -e s/sa110/arm/ \
@@ -172,6 +130,50 @@ else
UNSUPP_ERR endif
+
+FLAGS_BFD := $(CFLAGS) -lbfd
+has_bfd := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD))
+ifeq ($(has_bfd),y)
+ CFLAGS += -DCONFIG_HAS_BFD
+ OBJS += symbol.o
+ LIBS += -lbfd
+endif
+
+FLAGS_VNCSERVER := $(CFLAGS) -lvncserver
+has_vncserver := $(call try-cc,$(SOURCE_VNCSERVER),$(FLAGS_VNCSERVER))
+ifeq ($(has_vncserver),y)
+ OBJS += ui/vnc.o
+ CFLAGS += -DCONFIG_HAS_VNCSERVER
+ LIBS += -lvncserver
+endif
+
+FLAGS_SDL := $(CFLAGS) -lSDL
+has_SDL := $(call try-cc,$(SOURCE_SDL),$(FLAGS_SDL))
+ifeq ($(has_SDL),y)
+ OBJS += ui/sdl.o
+ CFLAGS += -DCONFIG_HAS_SDL
+ LIBS += -lSDL
+endif
+
+FLAGS_ZLIB := $(CFLAGS) -lz
+has_ZLIB := $(call try-cc,$(SOURCE_ZLIB),$(FLAGS_ZLIB))
+ifeq ($(has_ZLIB),y)
+ CFLAGS += -DCONFIG_HAS_ZLIB
+ LIBS += -lz
+endif
+
+FLAGS_AIO := $(CFLAGS) -laio
+has_AIO := $(call try-cc,$(SOURCE_AIO),$(FLAGS_AIO))
+ifeq ($(has_AIO),y)
+ CFLAGS += -DCONFIG_HAS_AIO
+ LIBS += -laio
+endif
+
+LIBS += -lrt
+LIBS += -lpthread
+LIBS += -lutil
+
+
DEPS := $(patsubst %.o,%.d,$(OBJS))
OBJS += $(OTHEROBJS)
next prev parent reply other threads:[~2011-12-09 6:52 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1323413420.git.matt@ozlabs.org>
2011-12-09 6:52 ` [PATCH V2 01/23] kvm tools: Only build/init i8042 on x86 Matt Evans
2011-12-09 6:52 ` Matt Evans [this message]
2011-12-09 6:53 ` [PATCH V2 02/23] kvm tools: Add Makefile parameter for kernel include Matt Evans
2011-12-09 6:53 ` [PATCH V2 04/23] kvm tools: Get correct 64-bit types on PPC64 and Matt Evans
2011-12-09 8:24 ` [PATCH V2 04/23] kvm tools: Get correct 64-bit types on PPC64 Sasha Levin
2011-12-09 8:29 ` [PATCH V2 04/23] kvm tools: Get correct 64-bit types on PPC64 and Pekka Enberg
2011-12-12 1:03 ` [PATCH V2 04/23] kvm tools: Get correct 64-bit types on PPC64 Matt Evans
2011-12-12 5:57 ` Pekka Enberg
2011-12-13 6:44 ` Matt Evans
2011-12-09 6:53 ` [PATCH V2 05/23] kvm tools: Add arch-specific KVM_RUN exit handling Matt Evans
2011-12-09 6:54 ` [PATCH V2 06/23] kvm tools: Don't die if KVM_CAP_NR_VCPUS isn't available Matt Evans
2011-12-09 6:54 ` [PATCH V2 07/23] kvm tools: Fix KVM_RUN exit code check Matt Evans
2011-12-09 6:54 ` [PATCH V2 08/23] kvm tools: Add kvm__arch_periodic_poll() Matt Evans
2011-12-09 6:54 ` [PATCH V2 09/23] kvm tools: Move arch-specific cmdline init into Matt Evans
2011-12-09 6:54 ` [PATCH V2 10/23] kvm tools: Add CONSOLE_HV term type and allow it Matt Evans
2011-12-09 6:54 ` [PATCH V2 11/23] kvm tools: Fix term_getc(), term_getc_iov() endian Matt Evans
2011-12-09 6:54 ` [PATCH V2 12/23] kvm tools: Allow initrd_check() to match a cpio Matt Evans
2011-12-09 6:54 ` [PATCH V2 13/23] kvm tools: Allow load_flat_binary() to load an initrd Matt Evans
2011-12-09 6:55 ` [PATCH V2 14/23] kvm tools: Initialise PCI before devices start getting Matt Evans
2011-12-09 6:55 ` [PATCH V2 15/23] kvm tools: Perform CPU and firmware setup after Matt Evans
2011-12-09 6:55 ` [PATCH V2 16/23] kvm tools: Init IRQs after determining nrcpus Matt Evans
2011-12-09 6:55 ` [PATCH V2 17/23] kvm tools: Add ability to map guest RAM from hugetlbfs Matt Evans
2011-12-09 7:39 ` [PATCH V2 17/23] kvm tools: Add ability to map guest RAM from Sasha Levin
2011-12-12 5:05 ` Matt Evans
2011-12-09 8:38 ` [PATCH V2 17/23] kvm tools: Add ability to map guest RAM from hugetlbfs Pekka Enberg
2011-12-12 6:19 ` [PATCH V2 17/23] kvm tools: Add ability to map guest RAM from Matt Evans
2011-12-09 8:42 ` [PATCH V2 17/23] kvm tools: Add ability to map guest RAM from hugetlbfs Pekka Enberg
2011-12-12 5:17 ` [PATCH V2 17/23] kvm tools: Add ability to map guest RAM from Matt Evans
2011-12-12 6:06 ` [PATCH V2 17/23] kvm tools: Add ability to map guest RAM from hugetlbfs Pekka Enberg
2011-12-09 6:55 ` [PATCH V2 18/23] kvm tools: Move PCI_MAX_DEVICES to pci.h Matt Evans
2011-12-09 6:55 ` [PATCH V2 19/23] kvm tools: Endian-sanitise pci.h and PCI device Matt Evans
2011-12-09 6:55 ` [PATCH V2 20/23] kvm tools: Correctly set virtio-pci bar_size and Matt Evans
2011-12-09 6:55 ` [PATCH V2 21/23] kvm tools: Add pci__config_{rd,wr}(), pci__find_dev() Matt Evans
2011-12-09 6:55 ` [PATCH V2 22/23] kvm tools: Arch-specific define for PCI MMIO allocation Matt Evans
2011-12-09 6:56 ` [PATCH V2 23/23] kvm tools: Create arch-specific kvm_cpu__emulate_{mm}io() Matt Evans
2011-12-09 7:53 ` [PATCH V2 23/23] kvm tools: Create arch-specific Sasha Levin
2011-12-12 1:08 ` [PATCH V2 23/23] kvm tools: Create arch-specific kvm_cpu__emulate_{mm}io() Matt Evans
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4EE1B03D.9090409@ozlabs.org \
--to=matt@ozlabs.org \
--cc=asias.hejun@gmail.com \
--cc=gorcunov@gmail.com \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=levinsasha928@gmail.com \
--cc=penberg@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox