From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Michael Walle" <michael@walle.cc>, "Fam Zheng" <fam@euphon.net>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Brad Smith" <brad@comstyle.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PATCH v3 2/5] configure: LM32 Milkymist Texture Mapping Unit (tmu2) also depends of X11
Date: Tue, 29 Jan 2019 16:00:26 +0100 [thread overview]
Message-ID: <20190129150029.29829-3-philmd@redhat.com> (raw)
In-Reply-To: <20190129150029.29829-1-philmd@redhat.com>
Commit 5f9b1e35060b8 remove the dependency between OpenGL and X11.
However the milkymist-tmu2 device do require X11.
When using SDL, the configure script sets need_x11=yes, so the X11
flags are populated to the makefiles.
When building without SDL, X11 is not pulled and populated, leading
to a link failure:
LINK lm32-softmmu/qemu-system-lm32
hw/lm32/milkymist.o: In function `milkymist_tmu2_create':
hw/lm32/milkymist-hw.h:114: undefined reference to `XOpenDisplay'
hw/lm32/milkymist-hw.h:140: undefined reference to `XFree'
hw/lm32/milkymist-hw.h:141: undefined reference to `XCloseDisplay'
hw/lm32/milkymist-hw.h:130: undefined reference to `XCloseDisplay'
../hw/display/milkymist-tmu2.o: In function `tmu2_glx_init':
hw/display/milkymist-tmu2.c:112: undefined reference to `XOpenDisplay'
hw/display/milkymist-tmu2.c:123: undefined reference to `XFree'
collect2: error: ld returned 1 exit status
gmake[1]: *** [Makefile:199: qemu-system-lm32] Error 1
Enforce the X11 dependency when the LM32 target is built.
This will allow us to build QEMU without SDL.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
configure | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/configure b/configure
index b18281c61f..c7024d6662 100755
--- a/configure
+++ b/configure
@@ -4047,6 +4047,16 @@ EOF
fi
fi
+if test "$opengl" = "yes" -a "$have_x11" = "yes"; then
+ for target in $target_list; do
+ case $target in
+ lm32-softmmu) # milkymist-tmu2 requires X11 and OpenGL
+ need_x11=yes
+ ;;
+ esac
+ done
+fi
+
##########################################
# libxml2 probe
if test "$libxml2" != "no" ; then
--
2.20.1
next prev parent reply other threads:[~2019-01-29 15:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-29 15:00 [Qemu-devel] [PATCH v3 0/5] sdl: Let it be optional (in particular, on OpenBSD) Philippe Mathieu-Daudé
2019-01-29 15:00 ` [Qemu-devel] [PATCH v3 1/5] hw/lm32: Move LM32 specific hardware out of common-obj list Philippe Mathieu-Daudé
2019-01-30 7:44 ` Gerd Hoffmann
2019-01-29 15:00 ` Philippe Mathieu-Daudé [this message]
2019-01-29 15:00 ` [Qemu-devel] [PATCH v3 3/5] hw/display/milkymist-tmu2: Explicit the dependency to both X11 / OpenGL Philippe Mathieu-Daudé
2019-01-29 15:00 ` [Qemu-devel] [PATCH v3 4/5] configure: Let SDL support be optional on OpenBSD Philippe Mathieu-Daudé
2019-01-30 7:52 ` Gerd Hoffmann
2019-01-29 15:00 ` [Qemu-devel] [PATCH v3 5/5] hw/display/milkymist-tmu2: Move inlined code from header to source Philippe Mathieu-Daudé
2019-02-03 1:24 ` [Qemu-devel] [PATCH v3 0/5] sdl: Let it be optional (in particular, on OpenBSD) no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190129150029.29829-3-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=berrange@redhat.com \
--cc=brad@comstyle.com \
--cc=fam@euphon.net \
--cc=kraxel@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=michael@walle.cc \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).