浏览代码

package/libostree: libfuse is optional, not mandatory

libfuse is optional since its addition in version 2016.2 with
https://github.com/ostreedev/ostree/commit/e9ccdd2d007801ef25cc7283188942d791889c27

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fabrice Fontaine 4 年之前
父节点
当前提交
e12000bf63
共有 2 个文件被更改,包括 9 次插入4 次删除
  1. 1 3
      package/libostree/Config.in
  2. 8 1
      package/libostree/libostree.mk

+ 1 - 3
package/libostree/Config.in

@@ -1,14 +1,12 @@
 config BR2_PACKAGE_LIBOSTREE
 	bool "libostree"
 	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme, libgpg-error
-	depends on !BR2_STATIC_LIBS # libfuse
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_WCHAR # libglib2
-	depends on BR2_USE_MMU # e2fsprogs, libfuse, libglib2, libgpgme
+	depends on BR2_USE_MMU # e2fsprogs, libglib2, libgpgme
 	# doesn't build with musl due to lack of TEMP_FAILURE_RETRY()
 	depends on !BR2_TOOLCHAIN_USES_MUSL
 	select BR2_PACKAGE_E2FSPROGS
-	select BR2_PACKAGE_LIBFUSE
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBGPG_ERROR
 	select BR2_PACKAGE_LIBGPGME

+ 8 - 1
package/libostree/libostree.mk

@@ -10,7 +10,7 @@ LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOST
 
 LIBOSTREE_LICENSE = LGPL-2.0+
 LIBOSTREE_LICENSE_FILES = COPYING
-LIBOSTREE_DEPENDENCIES = e2fsprogs host-bison host-pkgconf libfuse libglib2 libgpg-error libgpgme xz
+LIBOSTREE_DEPENDENCIES = e2fsprogs host-bison host-pkgconf libglib2 libgpg-error libgpgme xz
 LIBOSTREE_INSTALL_STAGING = YES
 
 LIBOSTREE_CONF_ENV = \
@@ -69,6 +69,13 @@ else
 LIBOSTREE_CONF_OPTS += --without-libarchive
 endif
 
+ifeq ($(BR2_PACKAGE_LIBFUSE),y)
+LIBOSTREE_CONF_OPTS += --enable-rofiles-fuse
+LIBOSTREE_DEPENDENCIES += libfuse
+else
+LIBOSTREE_CONF_OPTS += --disable-rofiles-fuse
+endif
+
 ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
 LIBOSTREE_CONF_OPTS += --with-selinux
 LIBOSTREE_DEPENDENCIES += libselinux