[Fontconfig] fontconfig: Branch 'master' - 3 commits

[GitLab Mirror]

 fc-cache/meson.build |    1 +
 meson.build          |    4 +---
 src/meson.build      |    7 ++++---
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit abc723366d692df2210346e0d4d3c5686e22c3ef
Author: Xavier Claessens <xavier.claessens at collabora.com>
Date:   Sat Oct 3 22:04:04 2020 -0400

    meson: Fix build failure when compiler is not in PATH
    
    When cross compiling gcc/clang could not exist in PATH and Meson could
    be using aarch64-linux-android-clang set in a cross file for example.

diff --git a/src/meson.build b/src/meson.build
index 0065e8f..5af3818 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -31,12 +31,13 @@ fc_sources = [
 ]
 
 # FIXME: obviously fragile, cc.preprocess would be sweet
+cpp = cc.cmd_array()
 if cc.get_id() == 'gcc'
-  cpp = ['gcc', '-E', '-P']
+  cpp += ['-E', '-P']
 elif cc.get_id() == 'msvc'
-  cpp = ['cl', '/EP']
+  cpp += ['/EP']
 elif cc.get_id() == 'clang'
-  cpp = ['clang', '-E', '-P']
+  cpp += ['-E', '-P']
 else
   error('FIXME: implement cc.preprocess')
 endif
commit 73353b3376e11e5d4b616d383569cad36c928718
Author: Xavier Claessens <xavier.claessens at collabora.com>
Date:   Fri Oct 2 16:24:39 2020 -0400

    meson: Use version comparison function

diff --git a/meson.build b/meson.build
index b534d93..b066392 100644
--- a/meson.build
+++ b/meson.build
@@ -368,7 +368,7 @@ fc_headers = [
 install_headers(fc_headers, subdir: meson.project_name())
 
 # Summary
-if meson.version() >= '0.53'
+if meson.version().version_compare('>= 0.53')
   doc_targets = get_variable('doc_targets', [])
 
   summary({
commit af052688d8f4ab23f2a29093f9c927b0f066af21
Author: Xavier Claessens <xavier.claessens at collabora.com>
Date:   Fri Oct 2 16:24:09 2020 -0400

    meson: Fix build when 'tools' option is disabled

diff --git a/fc-cache/meson.build b/fc-cache/meson.build
index 9e0fe72..8963ac5 100644
--- a/fc-cache/meson.build
+++ b/fc-cache/meson.build
@@ -6,3 +6,4 @@ fccache = executable('fc-cache', ['fc-cache.c', fcstdint_h, alias_headers, ft_al
 )
 
 tools_man_pages += ['fc-cache']
+meson.add_install_script('../install-cache.py', fccache.full_path())
diff --git a/meson.build b/meson.build
index 273d976..b534d93 100644
--- a/meson.build
+++ b/meson.build
@@ -367,8 +367,6 @@ fc_headers = [
 
 install_headers(fc_headers, subdir: meson.project_name())
 
-meson.add_install_script('install-cache.py', fccache.full_path())
-
 # Summary
 if meson.version() >= '0.53'
   doc_targets = get_variable('doc_targets', [])