diff options
| author | Andrei Pavel <andrei@isc.org> | 2021-09-11 18:27:06 +0200 |
|---|---|---|
| committer | Tomek Mrugalski <tomek@isc.org> | 2021-09-20 19:45:35 +0200 |
| commit | 7ede1ced156f58bbeb7b26984dc781a4f2517694 (patch) | |
| tree | 128f07abc9a412ad3cd079a7f85d5507b735314f | |
| parent | [#2081] remove attempt to link with OpenSSL 1.1 (diff) | |
| download | kea-7ede1ced156f58bbeb7b26984dc781a4f2517694.tar.xz kea-7ede1ced156f58bbeb7b26984dc781a4f2517694.zip | |
[#2081] install the default openssl-devel on CentOS 7
| -rwxr-xr-x | hammer.py | 29 |
1 files changed, 14 insertions, 15 deletions
@@ -1418,17 +1418,14 @@ def prepare_system_local(features, check_times): elif system == 'centos': install_pkgs('epel-release', env=env, check_times=check_times) - packages = ['make', 'autoconf', 'automake', 'libtool', 'gcc-c++', - 'log4cplus-devel', 'mariadb-devel', 'postgresql-devel'] + packages = ['autoconf', 'automake', 'boost-devel', 'gcc-c++', + 'libtool', 'log4cplus-devel', 'make', 'mariadb-devel', + 'openssl-devel', 'postgresql-devel'] if revision == '7': - # openssl-devel is version 1.0.2k which is out of support. - # Install 1.1.1g instead. + # Install newer version of Boost in case users want to opt-in with: + # --with-boost-include=/usr/include/boost169 --with-boost-lib-dir=/usr/lib64/boost169 packages.append('boost169-devel') - packages.append('openssl11-devel') - else: - packages.append('boost-devel') - packages.append('openssl-devel') if 'native-pkg' in features: packages.extend(['rpm-build', 'python3-devel']) @@ -1483,15 +1480,17 @@ def prepare_system_local(features, check_times): # prepare rhel elif system == 'rhel': - packages = ['make', 'autoconf', 'automake', 'libtool', 'gcc-c++', 'boost-devel', - 'mariadb-devel', 'postgresql-devel', 'rpm-build'] + packages = ['autoconf', 'automake', 'boost-devel', 'gcc-c++', + 'libtool', 'log4cplus-devel', 'make', 'mariadb-devel', + 'openssl-devel', 'postgresql-devel'] if revision == '7': - # openssl-devel is version 1.0.2k which is out of support. - # Install 1.1.1g instead. - packages.append('openssl11-devel') - else: - packages.append('openssl-devel') + # Install newer version of Boost in case users want to opt-in with: + # --with-boost-include=/usr/include/boost169 --with-boost-lib-dir=/usr/lib64/boost169 + packages.append('boost169-devel') + + if 'native-pkg' in features: + packages.extend(['python3-devel', 'rpm-build']) if 'docs' in features and not revision == '8': packages.extend(['libxslt', 'elinks', 'docbook-style-xsl']) |