qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Brad Smith" <brad@comstyle.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Michael Walle" <michael@walle.cc>, "Fam Zheng" <fam@euphon.net>,
	"Daniel P . Berrangé" <berrange@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PATCH v2 1/4] configure: LM32 Milkymist Texture Mapping Unit (tmu2) also depends of X11
Date: Thu, 24 Jan 2019 02:15:51 +0100	[thread overview]
Message-ID: <20190124011554.25418-2-philmd@redhat.com> (raw)
In-Reply-To: <20190124011554.25418-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 8f312ac3e2..d50defceb7 100755
--- a/configure
+++ b/configure
@@ -4038,6 +4038,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

  reply	other threads:[~2019-01-24  1:16 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-24  1:15 [Qemu-devel] [PATCH v2 0/4] sdl: Let it be optional (in particular, on OpenBSD) Philippe Mathieu-Daudé
2019-01-24  1:15 ` Philippe Mathieu-Daudé [this message]
2019-01-24  1:15 ` [Qemu-devel] [PATCH v2 2/4] hw/display/milkymist-tmu2: Explicit the dependency to both X11 / OpenGL Philippe Mathieu-Daudé
2019-01-24  1:15 ` [Qemu-devel] [PATCH v2 3/4] configure: Let SDL support be optional on OpenBSD Philippe Mathieu-Daudé
2019-01-24 11:23   ` Gerd Hoffmann
2019-01-24 13:51     ` Philippe Mathieu-Daudé
2019-01-24 15:33       ` Gerd Hoffmann
2019-01-24 11:44   ` Peter Maydell
2019-01-24 13:38     ` Philippe Mathieu-Daudé
2019-01-24  1:15 ` [Qemu-devel] [PATCH v2 4/4] hw/display/milkymist-tmu2: Move inlined code from header to source Philippe Mathieu-Daudé
2019-01-24 11:43   ` Gerd Hoffmann
2019-01-24 13:37     ` Philippe Mathieu-Daudé
2019-01-28 17:47     ` Philippe Mathieu-Daudé
2019-01-28 18:02       ` Peter Maydell
2019-01-28 18:28         ` Philippe Mathieu-Daudé
2019-01-29  8:21         ` Paolo Bonzini
2019-01-29 10:17           ` Peter Maydell
2019-01-29  5:47       ` Thomas Huth

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=20190124011554.25418-2-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=berrange@redhat.com \
    --cc=brad@comstyle.com \
    --cc=fam@euphon.net \
    --cc=kraxel@redhat.com \
    --cc=michael@walle.cc \
    --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).