From patchwork Wed Jun 3 20:41:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 480161 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 395AB1402B8 for ; Thu, 4 Jun 2015 06:42:52 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=vpo0hueb; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A29B394DF7; Wed, 3 Jun 2015 20:42:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id V5rQkYShlxYV; Wed, 3 Jun 2015 20:42:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BB22494E21; Wed, 3 Jun 2015 20:42:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id EA55C1C04C4 for ; Wed, 3 Jun 2015 20:42:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E63BC94B2D for ; Wed, 3 Jun 2015 20:42:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZlILNtmdb-Bd for ; Wed, 3 Jun 2015 20:42:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) by hemlock.osuosl.org (Postfix) with ESMTPS id 37DED94B07 for ; Wed, 3 Jun 2015 20:42:21 +0000 (UTC) Received: by wgez8 with SMTP id z8so18830141wge.0 for ; Wed, 03 Jun 2015 13:42:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=uCm7eCR10V4Gub8zbpODtZDcczDlMRxRuL2jmvCngdw=; b=vpo0hueb9nHbUWxFXYSWT47h/ZodASFOHSx4kCIQJrrFqrAOmqC2p8o4GIOK5WTNzL 2peMUpM9BRPFI0pIW/NSCJSExv4TdWrdpY2oCz+RAVzPe9y29Ql9qQPeeZ5zd4uxG6s9 JngbLUKEc0aysJ7ZyRU1FwHQm8o0petdM3lSDe8aZFmdUczAVsd/AtOa/G47o6opKPnL VQMJg8aM5ck8H4iJWpgV2HYJqGwjBVSOUSd7SaMlfrvrIazqXRaUt7enfwASUFuzwPQL sUd/qRHLW5FICRCk9y+S0Xgg++AjQKRlWyE/RfFX/AOjtRG6i6Afw0XA4gSqJBfs65SC N7Vw== X-Received: by 10.180.108.142 with SMTP id hk14mr943198wib.5.1433364139948; Wed, 03 Jun 2015 13:42:19 -0700 (PDT) Received: from gourin.bzh.lan (ns304657.ip-46-105-103.eu. [46.105.103.66]) by mx.google.com with ESMTPSA id u7sm28119517wif.3.2015.06.03.13.42.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jun 2015 13:42:19 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Wed, 3 Jun 2015 22:41:45 +0200 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 28/32 v2] package/matchbox: xlib-libXcursor is an optional dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" matchbox selects xlib-libXcursor, but does not build-depend on it. But xlib-libXcursor is only an optional dependency. Fix that by removing the select, and properly build-depend on it when it is enabled. Signed-off-by: "Yann E. MORIN" Reviewed-by: Arnout Vandecappelle (Essensium/Mind) --- package/matchbox/Config.in | 1 - package/matchbox/matchbox.mk | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in index 0c7e5ea..3a9f118 100644 --- a/package/matchbox/Config.in +++ b/package/matchbox/Config.in @@ -4,7 +4,6 @@ menuconfig BR2_PACKAGE_MATCHBOX depends on BR2_USE_MMU # fork() select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_MATCHBOX_LIB help Matchbox is an Open Source base environment for the X Window diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk index 1abcfd8..3b6a0eb 100644 --- a/package/matchbox/matchbox.mk +++ b/package/matchbox/matchbox.mk @@ -35,4 +35,8 @@ else MATCHBOX_CONF_OPTS += --disable-session endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) +MATCHBOX_DEPENDENCIES += xlib_libXcursor +endif + $(eval $(autotools-package))