[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 08/26] libcacard: fix mingw64 cross-compilation
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH 08/26] libcacard: fix mingw64 cross-compilation |
Date: |
Mon, 18 Mar 2013 15:54:09 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130219 Thunderbird/17.0.3 |
Il 18/03/2013 14:10, Alon Levy ha scritto:
> From: Marc-André Lureau <address@hidden>
>
> Compile and link with version.lo
>
> Signed-off-by: Marc-André Lureau <address@hidden>
> ---
> Makefile | 8 ++++++--
> rules.mak | 3 ++-
> 2 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 6915178..10abfee 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -151,11 +151,15 @@ recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
>
> bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)
>
> -version.o: $(SRC_PATH)/version.rc config-host.h
> +version.o: $(SRC_PATH)/version.rc config-host.h | version.lo
> $(call quiet-command,$(WINDRES) -I. -o $@ $<," RC $(TARGET_DIR)$@")
> +version.lo: $(SRC_PATH)/version.rc config-host.h
> + $(call quiet-command,$(LIBTOOL) --mode=compile --tag=RC $(WINDRES) -I.
> -o $@ $<,"lt RC $(TARGET_DIR)$@")
>
> version-obj-$(CONFIG_WIN32) += version.o
> -Makefile: $(version-obj-y)
> +version-lobj-$(CONFIG_WIN32) += $(if $(LIBTOOL),version.lo)
> +Makefile: $(version-obj-y) $(version-lobj-y)
> +
>
> ######################################################################
> # Build libraries
> diff --git a/rules.mak b/rules.mak
> index 36aba2d..292a422 100644
> --- a/rules.mak
> +++ b/rules.mak
> @@ -35,7 +35,8 @@ LIBTOOL += $(if $(V),,--quiet)
> LINK = $(call quiet-command,\
> $(if $(filter %.lo %.la,$^),$(LIBTOOL) --mode=link --tag=CC \
> )$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
> - $(sort $(filter %.o, $1)) $(filter-out %.o, $1) $(version-obj-y) \
> + $(sort $(filter %.o, $1)) $(filter-out %.o, $1) \
> + $(if $(filter %.lo %.la,$^),$(version-lobj-y),$(version-obj-y)) \
> $(if $(filter %.lo %.la,$^),$(LIBTOOLFLAGS)) \
> $(LIBS),$(if $(filter %.lo %.la,$^),"lt LINK ", " LINK
> ")"$(TARGET_DIR)$@")
> endif
>
Reviewed-by: Paolo Bonzini <address@hidden>
- [Qemu-devel] [PATCH 02/26] ccid-card-emul: do not crash if backend is not provided, (continued)
- [Qemu-devel] [PATCH 02/26] ccid-card-emul: do not crash if backend is not provided, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 04/26] ccid: declare DEFAULT_ATR table to be "static const", Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 07/26] build-sys: must link with -fstack-protector, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 06/26] util: move socket_init() to osdep.c, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 05/26] libcacard: use system config directory for nss db on win32, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 11/26] libcacard: teach vscclient to use GMainLoop for portability, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 10/26] libcacard: vscclient to use QemuThread for portability, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 12/26] hw/ccid-card-passthru.c: add atr check, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 08/26] libcacard: fix mingw64 cross-compilation, Alon Levy, 2013/03/18
- Re: [Qemu-devel] [PATCH 08/26] libcacard: fix mingw64 cross-compilation,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 09/26] libcacard: split vscclient main() from socket reading, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 15/26] hw/usb/dev-smartcard-reader.c: nicer debug messages, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 13/26] ccid-card-passthru, dev-smartcard-reader: add debug environment variables, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 16/26] hw/usb/dev-smartcard-reader.c: remove aborts (never triggered, but just in case), Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 14/26] hw/usb/dev-smartcard-reader.c: white space fixes, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 17/26] hw/usb/dev-smartcard-reader.c: define structs for CCID_Parameter internals, Alon Levy, 2013/03/18