From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=44531 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oh29X-0000Rr-9N for qemu-devel@nongnu.org; Thu, 05 Aug 2010 11:14:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oh29V-0006ep-Ve for qemu-devel@nongnu.org; Thu, 05 Aug 2010 11:14:39 -0400 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:35327) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oh29V-0006dK-FK for qemu-devel@nongnu.org; Thu, 05 Aug 2010 11:14:37 -0400 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [202.81.31.246]) by e23smtp05.au.ibm.com (8.14.4/8.13.1) with ESMTP id o75C1JQj006531 for ; Thu, 5 Aug 2010 22:01:19 +1000 Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o75C5d8h876598 for ; Thu, 5 Aug 2010 22:05:40 +1000 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o75C5dsa005321 for ; Thu, 5 Aug 2010 22:05:39 +1000 Date: Thu, 5 Aug 2010 17:35:35 +0530 From: Prerna Saxena Message-ID: <20100805173535.0abc18c8@zephyr> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [Tracing][PATCH] Compilation fixes List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Cc: Mahesh , Ananth Narayan , Stefan Hajnoczi Fix to ensure rebuild is properly triggered when switching trace backends using ./configure. Also, when using the 'ust' backend, check if the relevant headers are available at host. Signed-off-by: Prerna Saxena --- Makefile | 4 ++-- configure | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 8831174..3bd41ce 100644 --- a/Makefile +++ b/Makefile @@ -132,10 +132,10 @@ bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS) iov.o: iov.c iov.h -trace.h: $(SRC_PATH)/trace-events +trace.h: $(SRC_PATH)/trace-events config-host.mak $(call quiet-command,sh $(SRC_PATH)/tracetool --$(TRACE_BACKEND) -h < $< > $@," GEN $@") -trace.c: $(SRC_PATH)/trace-events +trace.c: $(SRC_PATH)/trace-events config-host.mak $(call quiet-command,sh $(SRC_PATH)/tracetool --$(TRACE_BACKEND) -c < $< > $@," GEN $@") trace.o: trace.c $(GENERATED_HEADERS) diff --git a/configure b/configure index fe1b027..ee9f1e3 100755 --- a/configure +++ b/configure @@ -2011,6 +2011,23 @@ if test "$?" -ne 0 ; then exit 1 fi +########################################## +# For 'ust' backend, test if ust headers are present +if test "$trace_backend" = "ust"; then + cat > $TMPC << EOF +#include +#include +int main(void) { return 0; } +EOF + if compile_prog "" "" ; then + LIBS="-lust $LIBS" + else + echo "ERROR: Trace backend 'ust' does not have relevant headers available" + echo " on the host. Pls choose a different backend." + exit 1 + fi +fi +########################################## # End of CC checks # After here, no more $cc or $ld runs @@ -2392,9 +2409,6 @@ echo "TRACE_BACKEND=$trace_backend" >> $config_host_mak if test "$trace_backend" = "simple"; then echo "CONFIG_SIMPLE_TRACE=y" >> $config_host_mak fi -if test "$trace_backend" = "ust"; then - LIBS="-lust $LIBS" -fi # Set the appropriate trace file. if test "$trace_backend" = "simple"; then trace_file="\"$trace_file-%u\"" -- 1.6.2.5 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India