diff options
Diffstat (limited to 'package/classpath/classpath.mk')
| -rw-r--r-- | package/classpath/classpath.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/package/classpath/classpath.mk b/package/classpath/classpath.mk index 2d1255261..61a103457 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 |