From patchwork Fri Jun 21 14:41:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markos Chandras X-Patchwork-Id: 253236 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id DF1222C008C for ; Sat, 22 Jun 2013 00:42:39 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B545E31D2D; Fri, 21 Jun 2013 14:42:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ICw86aRGucHY; Fri, 21 Jun 2013 14:42:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9FDB331C2A; Fri, 21 Jun 2013 14:42: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 490548F79F for ; Fri, 21 Jun 2013 14:42:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 56D5C89F25 for ; Fri, 21 Jun 2013 14:42:36 +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 gXiB3-Yz3nXL for ; Fri, 21 Jun 2013 14:42:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from multi.imgtec.com (multi.imgtec.com [194.200.65.239]) by whitealder.osuosl.org (Postfix) with ESMTPS id 866908C946 for ; Fri, 21 Jun 2013 14:42:34 +0000 (UTC) From: Markos Chandras To: Date: Fri, 21 Jun 2013 15:41:31 +0100 Message-ID: <1371825691-27746-1-git-send-email-markos.chandras@gmail.com> X-Mailer: git-send-email 1.8.2.1 MIME-Version: 1.0 X-SEF-Processed: 7_3_0_01192__2013_06_21_15_42_30 Subject: [Buildroot] [PATCH] gvfs: Depend on libgcrypt if it is selected 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Markos Chandras gvfs can make optional use of libgcrypt so it needs to depend on it if it is selected. It's also necessary to set the ac_cv_path_LIBGCRYPT_CONFIG variable to a known value in order to prevent the AM_PATH_LIBGCRYPT macro from searching the host paths for the libgcrypt-config script. Fixes the following build problem when libgcrypt is installed on the host system but the package is not selected in buildroot: gvfsbackendafpbrowse.c:31:20: fatal error: gcrypt.h: No such file or directory Signed-off-by: Markos Chandras --- package/gvfs/gvfs.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index d99c784..6e88f6e 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -12,6 +12,10 @@ GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR) GVFS_INSTALL_STAGING = YES GVFS_DEPENDENCIES = host-pkgconf host-libglib2 libglib2 dbus shared-mime-info +# Export ac_cv_path_LIBGCRYPT_CONFIG unconditionally to prevent +# build system from searching the host paths. +GVFS_CONF_ENV = ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config + GVFS_CONF_OPT = \ --disable-gconf \ --disable-cdda \ @@ -42,6 +46,10 @@ else GVFS_CONF_OPT += --disable-fuse endif +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +GVFS_DEPENDENCIES += libgcrypt +endif + ifeq ($(BR2_PACKAGE_LIBSOUP),y) GVFS_DEPENDENCIES += libsoup GVFS_CONF_OPT += --enable-http