[#4073] Hammer: Move ccache to common package section and put bison and flex under...

diff --git a/hammer.py b/hammer.py
index d5aca57f0b3e01ed1f45e07da7478ddbbfb16320..8b614b43c30ce36f46540983c6175abb58d324f9 100755 (executable)
--- a/hammer.py
+++ b/hammer.py
@@ -1760,8 +1760,14 @@ def install_packages_local(system, revision, features, check_times, ignore_error
     if 'netconf' in features and 'netconf' not in ignore_errors_for:
         require_minimum_package_version('cmake', '3.19')
 
+    packages = []
+
     # Common packages
-    packages = ['bison', 'flex']
+    if 'ccache' in features:
+        packages.append('ccache')
+
+    if 'docs' in features:
+        packages.extend(['bison', 'flex'])
 
     # prepare fedora
     if system == 'fedora':
@@ -1783,9 +1789,6 @@ def install_packages_local(system, revision, features, check_times, ignore_error
         if 'gssapi' in features:
             packages.extend(['krb5-devel'])
 
-        if 'ccache' in features:
-            packages.extend(['ccache'])
-
         if 'netconf' in features:
             packages.extend(['cmake', 'git', 'pcre2-devel'])
             # Even though meson sets rpath, it does not work in fedora.
@@ -1842,9 +1845,6 @@ def install_packages_local(system, revision, features, check_times, ignore_error
         if 'gssapi' in features:
             packages.extend(['krb5-devel'])
 
-        if 'ccache' in features:
-            packages.extend(['ccache'])
-
         if 'netconf' in features:
             packages.extend(['cmake', 'git', 'pcre2-devel'])
 
@@ -1897,9 +1897,6 @@ def install_packages_local(system, revision, features, check_times, ignore_error
         if 'gssapi' in features:
             packages.extend(['krb5-devel'])
 
-        if 'ccache' in features:
-            packages.extend(['ccache'])
-
         if 'netconf' in features:
             packages.extend(['cmake', 'git', 'pcre2-devel'])
 
@@ -1933,9 +1930,6 @@ def install_packages_local(system, revision, features, check_times, ignore_error
         if 'gssapi' in features:
             packages.extend(['krb5-devel'])
 
-        if 'ccache' in features:
-            packages.extend(['ccache'])
-
         if 'netconf' in features:
             packages.extend(['cmake', 'git', 'pcre2-devel'])
 
@@ -1997,9 +1991,6 @@ def install_packages_local(system, revision, features, check_times, ignore_error
         if 'gssapi' in features:
             packages.extend(['libkrb5-dev'])
 
-        if 'ccache' in features:
-            packages.extend(['ccache'])
-
         if 'netconf' in features:
             packages.extend(['cmake', 'git', 'libpcre2-dev'])
 
@@ -2058,9 +2049,6 @@ def install_packages_local(system, revision, features, check_times, ignore_error
         if 'gssapi' in features:
             packages.extend(['libkrb5-dev'])
 
-        if 'ccache' in features:
-            packages.extend(['ccache'])
-
         install_pkgs(packages, env=env, timeout=240, check_times=check_times)
 
     # prepare freebsd
@@ -2108,9 +2096,6 @@ def install_packages_local(system, revision, features, check_times, ignore_error
             # it's deleted so that Kea uses the MIT packages added just above.
             execute('sudo rm -f /usr/bin/krb5-config')
 
-        if 'ccache' in features:
-            packages.extend(['ccache'])
-
         if 'netconf' in features:
             packages.extend(['cmake', 'git', 'pcre2'])
 
@@ -2155,9 +2140,6 @@ def install_packages_local(system, revision, features, check_times, ignore_error
         if 'native-pkg' in features:
             packages.extend(['alpine-sdk', 'python3-dev'])
 
-        if 'ccache' in features:
-            packages.extend(['ccache'])
-
         if 'unittest' in features:
             packages.append('wget')
             deferred_functions.append(_install_gtest_sources)