| Message ID | 1425376688-4065-1-git-send-email-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 3 March 2015 at 18:58, Gerd Hoffmann <kraxel@redhat.com> wrote: > Hi, > > Misc stuff in the basket: sdl bugfixes, some preparing patches for the > upcoming opengl support in sdl2, x11 build improvement. > > please pull, > Gerd > > The following changes since commit 0856579cac2f1dacecd847cfcd89680d26ff78f5: > > Revert "Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging" (2015-03-03 00:29:17 +0000) > > are available in the git repository at: > > git://git.kraxel.org/qemu tags/pull-sdl-20150303-1 > > for you to fetch changes up to 32a2e5d184ffcc083288638a1b6fc6a05db22817: > > pixman: add a bunch of PIXMAN_BE_* defines for 32bpp (2015-03-03 10:53:00 +0100) > > ---------------------------------------------------------------- > misc ui patches, mostly sdl related. > > ---------------------------------------------------------------- Fails to build on OSX, I'm afraid: In file included from /Users/pm215/src/qemu/hw/lm32/milkymist.c:30: /Users/pm215/src/qemu/hw/lm32/milkymist-hw.h:90:10: fatal error: 'X11/Xlib.h' file not found #include <X11/Xlib.h> ^ 1 error generated. x86/Linux clang also fails at link time: e104462:trusty:qemu-for-merges$ make -C build/clang V=1 make: Entering directory `/home/petmay01/linaro/qemu-for-merges/build/clang' clang -I/home/petmay01/linaro/qemu-for-merges/tcg -I/home/petmay01/linaro/qemu-for-merges/tcg/i386 -I/home/petmay01/linaro/qemu-for-merges/linux-headers -I/home/petmay01/linaro/qemu-for-merges/build/clang/linux-headers -I. -I/home/petmay01/linaro/qemu-for-merges -I/home/petmay01/linaro/qemu-for-merges/include -I/home/petmay01/linaro/qemu-for-merges/hw/display -Ihw/display -I/usr/include/pixman-1 -fPIE -DPIE -m64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fsanitize=undefined -Werror -Wno-string-plus-int -Wno-initializer-overrides -Wendif-labels -Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-definition -Wtype-limits -fstack-protector-all -I/usr/include/p11-kit-1 -I/usr/include/p11-kit-1 -I/usr/include/libpng12 -I/usr/include/spice-server -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/spice-1 -I/usr/include/libusb-1.0 -I/home/petmay01/linaro/qemu-for-merges/tests -MMD -MP -MT hw/display/milkymist-tmu2.o -MF hw/display/milkymist-tmu2.d -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -pthread -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -g -lGL -c -o hw/display/milkymist-tmu2.o /home/petmay01/linaro/qemu-for-merges/hw/display/milkymist-tmu2.c clang: error: -lGL: 'linker' input unused Looks like it doesn't like you providing a linker option when you're not asking it to do a link... -- PMM
Hi, > hw/display/milkymist-tmu2.o -MF hw/display/milkymist-tmu2.d -O2 > -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -pthread -I/usr/include/glib-2.0 > -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -g -lGL -c -o > hw/display/milkymist-tmu2.o > /home/petmay01/linaro/qemu-for-merges/hw/display/milkymist-tmu2.c > clang: error: -lGL: 'linker' input unused Hmm, can't see where this is coming from. Possibly it is old, just triggering now because the new opengl test now succeeds on macosx. Can you attach the config-mak.h for this please? thanks, Gerd
On 10 March 2015 at 09:19, Gerd Hoffmann <kraxel@redhat.com> wrote: > Hi, > >> hw/display/milkymist-tmu2.o -MF hw/display/milkymist-tmu2.d -O2 >> -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -pthread -I/usr/include/glib-2.0 >> -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -g -lGL -c -o >> hw/display/milkymist-tmu2.o >> /home/petmay01/linaro/qemu-for-merges/hw/display/milkymist-tmu2.c >> clang: error: -lGL: 'linker' input unused > > Hmm, can't see where this is coming from. Possibly it is old, just > triggering now because the new opengl test now succeeds on macosx. No, this is x86/Linux clang, not OSX. > Can you attach the config-mak.h for this please? Attached. This bit in configure looks bogus: opengl_cflags="$($pkg_config --libs $opengl_pkgs) $x11_cflags" opengl_libs="$($pkg_config --libs $opengl_pkgs) $x11_libs" ...surely we should be adding the opengl cflags to opengl_cflags, not putting the --libs switches in there as well as in opengl_libs? This seems to be a new thing in commit b5e830d8aa6 in your pull. -- PMM
On Di, 2015-03-10 at 09:54 +0000, Peter Maydell wrote: > On 10 March 2015 at 09:19, Gerd Hoffmann <kraxel@redhat.com> wrote: > > Hi, > > > >> hw/display/milkymist-tmu2.o -MF hw/display/milkymist-tmu2.d -O2 > >> -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -pthread -I/usr/include/glib-2.0 > >> -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -g -lGL -c -o > >> hw/display/milkymist-tmu2.o > >> /home/petmay01/linaro/qemu-for-merges/hw/display/milkymist-tmu2.c > >> clang: error: -lGL: 'linker' input unused > > > > Hmm, can't see where this is coming from. Possibly it is old, just > > triggering now because the new opengl test now succeeds on macosx. > > No, this is x86/Linux clang, not OSX. Hmm, funny my clang didn't complain. > > Can you attach the config-mak.h for this please? > > Attached. > > This bit in configure looks bogus: > > opengl_cflags="$($pkg_config --libs $opengl_pkgs) $x11_cflags" Indeed. Should be --cflags. Fixed, updated pull here: git://git.kraxel.org/qemu tags/pull-sdl-20150310-1 cheers, Gerd
Hi, Misc stuff in the basket: sdl bugfixes, some preparing patches for the upcoming opengl support in sdl2, x11 build improvement. please pull, Gerd The following changes since commit 0856579cac2f1dacecd847cfcd89680d26ff78f5: Revert "Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging" (2015-03-03 00:29:17 +0000) are available in the git repository at: git://git.kraxel.org/qemu tags/pull-sdl-20150303-1 for you to fetch changes up to 32a2e5d184ffcc083288638a1b6fc6a05db22817: pixman: add a bunch of PIXMAN_BE_* defines for 32bpp (2015-03-03 10:53:00 +0100) ---------------------------------------------------------------- misc ui patches, mostly sdl related. ---------------------------------------------------------------- Benjamin Herrenschmidt (2): sdl: Refresh debug statements sdl: Fix crash when calling sdl_switch() with NULL surface Gerd Hoffmann (2): configure: opengl overhaul pixman: add a bunch of PIXMAN_BE_* defines for 32bpp Jeremy White (1): Allow the use of X11 from a non standard location. configure | 59 +++++++++++++++++++++++----------------- default-configs/lm32-softmmu.mak | 2 +- hw/display/Makefile.objs | 3 +- hw/lm32/milkymist-hw.h | 4 +-- include/sysemu/sysemu.h | 1 + include/ui/qemu-pixman.h | 16 +++++++++++ ui/sdl.c | 27 ++++++++++++++++-- vl.c | 1 + 8 files changed, 81 insertions(+), 32 deletions(-)