Skip to contentSkip to conversation

gvfs: Depend on libgcrypt if it is selected

PATCH New Markos Chandras 2 participants 2 messages Jun 21, 2013 – Jun 24, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gvfs: Depend on libgcrypt if it is selected

From: Markos Chandras <[email protected]>

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

---
 package/gvfs/gvfs.mk | 8 ++++++++
 1 file changed, 8 insertions(+)
package/gvfs/gvfs.mk +8 -0
index d99c784..6e88f6e 100644
@@ -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
Signature · 1 line
1.8.2.1
#1 lore raw

PATCH 1/1 gvfs: Depend on libgcrypt if it is selected

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Markos" == Markos Chandras <[email protected]> writes:

Markos> From: Markos Chandras <[email protected]> Markos> gvfs can make optional use of libgcrypt so it needs to depend on Markos> it if it is selected. It's also necessary to set the Markos> ac_cv_path_LIBGCRYPT_CONFIG variable to a known value in order Markos> to prevent the AM_PATH_LIBGCRYPT macro from searching the host Markos> paths for the libgcrypt-config script.

Markos> Fixes the following build problem when libgcrypt is installed on the Markos> host system but the package is not selected in buildroot:

Markos> gvfsbackendafpbrowse.c:31:20: fatal error: gcrypt.h: No such file or directory

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard