diff options
Diffstat (limited to 'recipes/ostree/ostree/Fix-enable_rofiles_fuse-no-build.patch')
-rw-r--r-- | recipes/ostree/ostree/Fix-enable_rofiles_fuse-no-build.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/recipes/ostree/ostree/Fix-enable_rofiles_fuse-no-build.patch b/recipes/ostree/ostree/Fix-enable_rofiles_fuse-no-build.patch new file mode 100644 index 0000000..480fc21 --- /dev/null +++ b/recipes/ostree/ostree/Fix-enable_rofiles_fuse-no-build.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From b54643153cade28523cccee44fdddea2c94e0684 Mon Sep 17 00:00:00 2001 | ||
2 | From: Gatis Paeglis <gatis.paeglis@theqtcompany.com> | ||
3 | Date: Mon, 25 Apr 2016 13:57:03 +0200 | ||
4 | Subject: [PATCH] Fix --enable_rofiles_fuse=no build | ||
5 | |||
6 | --- | ||
7 | Makefile.am | 2 ++ | ||
8 | configure.ac | 2 +- | ||
9 | 2 files changed, 3 insertions(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/Makefile.am b/Makefile.am | ||
12 | index 488d4b6..e49b7c5 100644 | ||
13 | --- a/Makefile.am | ||
14 | +++ b/Makefile.am | ||
15 | @@ -71,7 +71,9 @@ include Makefile-otutil.am | ||
16 | include Makefile-libostree.am | ||
17 | include Makefile-ostree.am | ||
18 | include Makefile-switchroot.am | ||
19 | +if BUILDOPT_FUSE | ||
20 | include src/rofiles-fuse/Makefile-inc.am | ||
21 | +endif | ||
22 | include Makefile-tests.am | ||
23 | include Makefile-boot.am | ||
24 | include Makefile-man.am | ||
25 | diff --git a/configure.ac b/configure.ac | ||
26 | index dca9f53..6af60e8 100644 | ||
27 | --- a/configure.ac | ||
28 | +++ b/configure.ac | ||
29 | @@ -222,7 +222,7 @@ AC_ARG_ENABLE(rofiles-fuse, | ||
30 | [AS_HELP_STRING([--enable-rofiles-fuse], | ||
31 | [generate rofiles-fuse helper [default=yes]])],, | ||
32 | enable_rofiles_fuse=yes) | ||
33 | -AS_IF([ test $enable_rofiles_fuse != xno ], [ | ||
34 | +AS_IF([ test x$enable_rofiles_fuse != xno ], [ | ||
35 | PKG_CHECK_MODULES(BUILDOPT_FUSE, $FUSE_DEPENDENCY) | ||
36 | ], [enable_rofiles_fuse=no]) | ||
37 | AM_CONDITIONAL(BUILDOPT_FUSE, test x$enable_rofiles_fuse = xyes) | ||
38 | -- | ||
39 | 2.7.4 | ||
40 | |||