From: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Date: Sun, 12 May 2013 08:31:44 +0000 (+0000)
Subject: classpath: remove qt support
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4624567df1c5e05963ecc0f2a36299a89068ca41;p=buildroot.git

classpath: remove qt support

classpath doesn't work with Qt in buildroot. It assumes qt will run on X11,
but we don't have qt-x11 support on buildroot.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---

diff --git a/package/classpath/classpath.mk b/package/classpath/classpath.mk
index 2d1255261a..61a1034571 100644
--- a/package/classpath/classpath.mk
+++ b/package/classpath/classpath.mk
@@ -8,6 +8,10 @@ CLASSPATH_CONF_OPT = \
 	--disable-gconf-peer \
 	--disable-tools
 
+# classpath assumes qt runs on top of X11, but we
+# don't support qt4 on X11
+CLASSPATH_CONF_OPT += --disable-qt-peer
+
 CLASSPATH_DEPENDENCIES = host-pkgconf
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
@@ -39,13 +43,6 @@ else
 CLASSPATH_CONF_OPT += --disable-gtk-peer --disable-gstreamer-peer
 endif
 
-ifeq ($(BR2_PACKAGE_QT),y)
-CLASSPATH_CONF_OPT += --enable-qt-peer
-CLASSPATH_DEPENDENCIES += qt
-else
-CLASSPATH_CONF_OPT += --disable-qt-peer
-endif
-
 ifeq ($(BR2_PACKAGE_LIBXML2)$(BR2_PACKAGE_LIBXSLT),yy)
 CLASSPATH_CONF_OPT += --enable-xmlj
 CLASSPATH_DEPENDENCIES += libxml2 libxslt