From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SdiFt-00017J-5P for qemu-devel@nongnu.org; Sun, 10 Jun 2012 09:32:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SdiFr-0006K0-90 for qemu-devel@nongnu.org; Sun, 10 Jun 2012 09:32:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19993) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SdiFr-0006Jh-1n for qemu-devel@nongnu.org; Sun, 10 Jun 2012 09:32:31 -0400 Date: Sun, 10 Jun 2012 16:32:21 +0300 From: Alon Levy Message-ID: <20120610133221.GO20536@garlic.redhat.com> References: <017b2d0961daf25d156270f69962fa82ba5be00c.1339333471.git.blauwirbel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <017b2d0961daf25d156270f69962fa82ba5be00c.1339333471.git.blauwirbel@gmail.com> Subject: Re: [Qemu-devel] [PATCH 1/2] libcacard: build fixes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Blue Swirl Cc: qemu-devel@nongnu.org On Sun, Jun 10, 2012 at 01:04:32PM +0000, Blue Swirl wrote: > Link trace objects to fix these errors: > LINK vscclient > oslib-posix.o: In function `trace_qemu_vfree': > /src/qemu/obj-amd64/./trace.h:39: undefined reference to `trace1' > oslib-posix.o: In function `trace_qemu_memalign': > /src/qemu/obj-amd64/./trace.h:31: undefined reference to `trace3' > oslib-posix.o: In function `trace_qemu_vmalloc': > /src/qemu/obj-amd64/./trace.h:35: undefined reference to `trace2' Ack. > > Add LDFLAGS to vscclient link command. > > Clean up also in subdirectories of libcacard. > > Use quiet-command for sed invocation. > > Signed-off-by: Blue Swirl > --- > Makefile | 4 ++-- > libcacard/Makefile | 9 +++++---- > 2 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/Makefile b/Makefile > index 32550cb..560cd9c 100644 > --- a/Makefile > +++ b/Makefile > @@ -148,8 +148,8 @@ install-libcacard: libcacard.la > $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" install-libcacard,) > endif > > -vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) qemu-timer-common.o libcacard/vscclient.o > - $(call quiet-command,$(CC) -o $@ $^ $(libcacard_libs) $(LIBS)," LINK $@") > +vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) $(trace-obj-y) qemu-timer-common.o libcacard/vscclient.o > + $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(libcacard_libs) $(LIBS)," LINK $@") > > ###################################################################### > > diff --git a/libcacard/Makefile b/libcacard/Makefile > index fdc2873..63990b7 100644 > --- a/libcacard/Makefile > +++ b/libcacard/Makefile > @@ -15,8 +15,8 @@ QEMU_CFLAGS+=-I../ > libcacard.lib-y=$(patsubst %.o,%.lo,$(libcacard-y)) > > clean: > - rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo .libs/* *.la *.pc > - rm -Rf .libs > + rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo */*.lo .libs/* */.libs/* *.la */*.la *.pc > + rm -Rf .libs */.libs > > all: libcacard.la libcacard.pc > # Dummy command so that make thinks it has done something > @@ -37,11 +37,12 @@ libcacard.la: $(libcacard.lib-y) $(QEMU_OBJS_LIB) > > libcacard_srcpath=$(SRC_PATH)/libcacard > libcacard.pc: $(libcacard_srcpath)/libcacard.pc.in > - sed -e 's|@LIBDIR@|$(libdir)|' \ > + $(call quiet-command,sed -e 's|@LIBDIR@|$(libdir)|' \ > -e 's|@INCLUDEDIR@|$(libcacard_includedir)|' \ > -e 's|@VERSION@|$(shell cat $(SRC_PATH)/VERSION)|' \ > -e 's|@PREFIX@|$(prefix)|' \ > - < $(libcacard_srcpath)/libcacard.pc.in > libcacard.pc > + < $(libcacard_srcpath)/libcacard.pc.in > libcacard.pc,\ > + " GEN $@") > > .PHONY: install-libcacard > > -- > 1.7.2.5 > >