From patchwork Sun May 12 18:31:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 243209 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 8BFFE2C009A for ; Mon, 13 May 2013 04:32:01 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 457A9101F8C; Sun, 12 May 2013 18:31:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pzcZvuEpuI2K; Sun, 12 May 2013 18:31:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2D659101906; Sun, 12 May 2013 18:31:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4513D8F753 for ; Sun, 12 May 2013 18:32:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A86E68ADB1 for ; Sun, 12 May 2013 18:31:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id weS2J3Z1zebP for ; Sun, 12 May 2013 18:31:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from viper.mind.be (132.79-246-81.adsl-static.isp.belgacom.be [81.246.79.132]) by whitealder.osuosl.org (Postfix) with ESMTPS id BE6B68A8E5 for ; Sun, 12 May 2013 18:31:51 +0000 (UTC) Received: from [172.16.2.6] (helo=vandecaa-laptop) by viper.mind.be with esmtp (Exim 4.69) (envelope-from ) id 1Ubb3D-0006ZD-Ng; Sun, 12 May 2013 20:31:16 +0200 Received: from arnout by vandecaa-laptop with local (Exim 4.80) (envelope-from ) id 1Ubb3g-0003U0-PH; Sun, 12 May 2013 20:31:44 +0200 From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@busybox.net Date: Sun, 12 May 2013 20:31:44 +0200 Message-Id: <1368383504-13355-1-git-send-email-arnout@mind.be> X-Mailer: git-send-email 1.8.2.1 Subject: [Buildroot] [PATCH] classpath: remove qt support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: "Arnout Vandecappelle (Essensium/Mind)" 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) --- package/classpath/classpath.mk | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/package/classpath/classpath.mk b/package/classpath/classpath.mk index 2d12552..61a1034 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