1. Patchew
  2. QEMU
  3. View series

[Qemu-devel] [PATCH for-2.11] Fix build of console and GUI executables for Windows

Stefan Weil posted 1 patch 6 years, 5 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20171116163732.31584-1-sw@weilnetz.de
Test checkpatch passed
Test docker passed
Test ppc passed
Test s390x passed
Makefile.target | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[Qemu-devel] [PATCH for-2.11] Fix build of console and GUI executables for Windows
Posted by Stefan Weil 6 years, 5 months ago 
It was broken by commit 8ecc89f6e792152496eccb684d6c8c48aba8027d which
moved the SDL linker flags from macro libs_softmmu to macro SDL_LIBS.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---

Peter, can you apply this fix directly, or do you need a pull request?

Regards
Stefan

 Makefile.target | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.target b/Makefile.target
index e4244c188a..f9a9da7e7c 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -22,7 +22,7 @@ QEMU_PROG_BUILD = $(QEMU_PROG)
 else
 # system emulator name
 QEMU_PROG=qemu-system-$(TARGET_NAME)$(EXESUF)
-ifneq (,$(findstring -mwindows,$(libs_softmmu)))
+ifneq (,$(findstring -mwindows,$(SDL_LIBS)))
 # Terminate program name with a 'w' because the linker builds a windows executable.
 QEMU_PROGW=qemu-system-$(TARGET_NAME)w$(EXESUF)
 $(QEMU_PROG): $(QEMU_PROGW)
-- 
2.11.0
Re: [Qemu-devel] [PATCH for-2.11] Fix build of console and GUI executables for Windows
Posted by Stefan Weil 6 years, 4 months ago 
Am 16.11.2017 um 17:37 schrieb Stefan Weil:
> It was broken by commit 8ecc89f6e792152496eccb684d6c8c48aba8027d which
> moved the SDL linker flags from macro libs_softmmu to macro SDL_LIBS.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
> 
> Peter, can you apply this fix directly, or do you need a pull request?
> 
> Regards
> Stefan
> 
>  Makefile.target | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile.target b/Makefile.target
> index e4244c188a..f9a9da7e7c 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -22,7 +22,7 @@ QEMU_PROG_BUILD = $(QEMU_PROG)
>  else
>  # system emulator name
>  QEMU_PROG=qemu-system-$(TARGET_NAME)$(EXESUF)
> -ifneq (,$(findstring -mwindows,$(libs_softmmu)))
> +ifneq (,$(findstring -mwindows,$(SDL_LIBS)))
>  # Terminate program name with a 'w' because the linker builds a windows executable.
>  QEMU_PROGW=qemu-system-$(TARGET_NAME)w$(EXESUF)
>  $(QEMU_PROG): $(QEMU_PROGW)


The fix missed v2.11.0-rc2. Can it be applied before v2.11.0-rc3?

Thanks, Stefan
Re: [Qemu-devel] [PATCH for-2.11] Fix build of console and GUI executables for Windows
Posted by Peter Maydell 6 years, 4 months ago 
On 21 November 2017 at 21:04, Stefan Weil <sw@weilnetz.de> wrote:
> Am 16.11.2017 um 17:37 schrieb Stefan Weil:
>> It was broken by commit 8ecc89f6e792152496eccb684d6c8c48aba8027d which
>> moved the SDL linker flags from macro libs_softmmu to macro SDL_LIBS.
>>
>> Signed-off-by: Stefan Weil <sw@weilnetz.de>
>> ---
>>
>> Peter, can you apply this fix directly, or do you need a pull request?
>>
>> Regards
>> Stefan
>>
>>  Makefile.target | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/Makefile.target b/Makefile.target
>> index e4244c188a..f9a9da7e7c 100644
>> --- a/Makefile.target
>> +++ b/Makefile.target
>> @@ -22,7 +22,7 @@ QEMU_PROG_BUILD = $(QEMU_PROG)
>>  else
>>  # system emulator name
>>  QEMU_PROG=qemu-system-$(TARGET_NAME)$(EXESUF)
>> -ifneq (,$(findstring -mwindows,$(libs_softmmu)))
>> +ifneq (,$(findstring -mwindows,$(SDL_LIBS)))
>>  # Terminate program name with a 'w' because the linker builds a windows executable.
>>  QEMU_PROGW=qemu-system-$(TARGET_NAME)w$(EXESUF)
>>  $(QEMU_PROG): $(QEMU_PROGW)
>
>
> The fix missed v2.11.0-rc2. Can it be applied before v2.11.0-rc3?

Sure, I've put it on my list. In general though, just cc'ing
me on patches is not guaranteed to get my attention, as I
more or less ignore whether I'm cc'd or not as I scan
subject lines. Sending a pull request is the best way to
guarantee getting something to my attention to be applied;
pull requests are the mechanism for allowing me to ignore
patches related to all the parts of QEMU I don't care
about, by delegating them to somebody else :-)

thanks
-- PMM
Re: [Qemu-devel] [PATCH for-2.11] Fix build of console and GUI executables for Windows
Posted by Peter Maydell 6 years, 4 months ago 
On 16 November 2017 at 16:37, Stefan Weil <sw@weilnetz.de> wrote:
> It was broken by commit 8ecc89f6e792152496eccb684d6c8c48aba8027d which
> moved the SDL linker flags from macro libs_softmmu to macro SDL_LIBS.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>
> Peter, can you apply this fix directly, or do you need a pull request?
>
> Regards
> Stefan
>
>  Makefile.target | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile.target b/Makefile.target
> index e4244c188a..f9a9da7e7c 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -22,7 +22,7 @@ QEMU_PROG_BUILD = $(QEMU_PROG)
>  else
>  # system emulator name
>  QEMU_PROG=qemu-system-$(TARGET_NAME)$(EXESUF)
> -ifneq (,$(findstring -mwindows,$(libs_softmmu)))
> +ifneq (,$(findstring -mwindows,$(SDL_LIBS)))
>  # Terminate program name with a 'w' because the linker builds a windows executable.
>  QEMU_PROGW=qemu-system-$(TARGET_NAME)w$(EXESUF)
>  $(QEMU_PROG): $(QEMU_PROGW)
> --
> 2.11.0

Applied, thanks.

-- PMM

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.