Don't bother building ffcmp on platforms where we don't run tests.
authorCarl Hetherington <cth@carlh.net>
Sun, 29 Sep 2024 17:53:43 +0000 (19:53 +0200)
committerCarl Hetherington <cth@carlh.net>
Sun, 29 Sep 2024 21:36:27 +0000 (23:36 +0200)
It would be nice to check for_package as well but that needs passing
into dependencies() to work.

cscript

diff --git a/cscript b/cscript
index 4862c224e9e04004e48c5fec71b3d8b107d8977c..7205a6dee1e37c2a8e38ebe312fb708dd43c57de 100644 (file)
--- a/cscript
+++ b/cscript
@@ -547,21 +547,27 @@ def dependencies(target, options):
     deps.append(('openssl', '54298369cacfe0ae01c5aa42ace8a463fd2e7a2e'))
     if can_build_disk(target):
         deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f'))
-    deps.append(('ffcmp', '29265c42838fbb647c404cf73b6fca5259cf2093'))
+    if build_tests(target):
+        deps.append(('ffcmp', '29265c42838fbb647c404cf73b6fca5259cf2093'))
 
     return deps
 
 option_defaults = { "gui": True, "variant": None }
 
-def configure_options(target, options, for_package=False):
-    opt = ' --warnings-are-errors'
 
-    if for_package or not (
+def build_tests(target):
+    # Currently we only build tests on macOS, Windows, and some Ubuntu versions
+    return (
             (target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ['18.04', '22.04', '24.04']) or
             (target.platform == 'osx') or
             (target.platform == 'windows')
-        ):
-        # Currently we only build tests on macOS, Windows, and some Ubuntu versions
+        )
+
+
+def configure_options(target, options, for_package=False):
+    opt = ' --warnings-are-errors'
+
+    if for_package or not build_tests(target):
         opt += ' --disable-tests'
 
     if target.debug: