[libsoup/cherry-pick-01e361fc] meson: skip the fallback for sysprof on Windows




commit e190e70298be1186ad1a8a5dd0ac430463f76fee
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Tue Dec 22 19:51:23 2020 +0100

    meson: skip the fallback for sysprof on Windows
    
    Otherwise it will download the subproject and fail when trying to build
    it since sysprof is Linux only.
    
    Instead skip the fallback on Windows, so that if force-enabled it will
    fail, but in auto mode it will just skip sysprof.
    
    
    (cherry picked from commit 01e361fcb9a4775e98ce13bc7f0c56ac405e9d3a)

 meson.build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index 0b79523b..eb52f877 100644
--- a/meson.build
+++ b/meson.build
@@ -164,7 +164,9 @@ libsysprof_capture_dep = dependency('sysprof-capture-4',
     'with_sysprofd=none',
     'help=false',
   ],
-  fallback: ['sysprof', 'libsysprof_capture_dep'],
+  # sysprof doesn't support Windows, so don't fall back to the subproject which fails to build,
+  # instead let it fail here so that sysprof gets skipped
+  fallback: (host_system != 'windows') ? ['sysprof', 'libsysprof_capture_dep'] : [],
 )
 cdata.set('HAVE_SYSPROF', libsysprof_capture_dep.found())
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]