Message ID | 017b2d0961daf25d156270f69962fa82ba5be00c.1339333471.git.blauwirbel@gmail.com |
---|---|
State | New |
Headers | show |
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 <blauwirbel@gmail.com> > --- > 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 > >
Am 10.06.2012 15:04, schrieb Blue Swirl: > 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' > > Add LDFLAGS to vscclient link command. > > Clean up also in subdirectories of libcacard. > > Use quiet-command for sed invocation. > > Signed-off-by: Blue Swirl <blauwirbel@gmail.com> Reviewed-by: Andreas Färber <afaerber@suse.de> /-F
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
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' Add LDFLAGS to vscclient link command. Clean up also in subdirectories of libcacard. Use quiet-command for sed invocation. Signed-off-by: Blue Swirl <blauwirbel@gmail.com> --- Makefile | 4 ++-- libcacard/Makefile | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-)