Skip to content

Commit d53b242

Browse files
committed
[#3350] put bison and flex as free packages in hammer
1 parent d1d3e20 commit d53b242

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

hammer.py

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1661,7 +1661,7 @@ def install_packages_local(system, revision, features, check_times, ignore_error
16611661
# prepare fedora
16621662
if system == 'fedora':
16631663
packages = ['make', 'autoconf', 'automake', 'libtool', 'gcc-c++', 'openssl-devel',
1664-
'log4cplus-devel', 'boost-devel', 'libpcap-devel']
1664+
'log4cplus-devel', 'boost-devel', 'libpcap-devel', 'bison', 'flex']
16651665

16661666
if 'native-pkg' in features:
16671667
packages.extend(['rpm-build', 'python3-devel'])
@@ -1703,7 +1703,7 @@ def install_packages_local(system, revision, features, check_times, ignore_error
17031703

17041704
packages = ['autoconf', 'automake', 'boost-devel', 'gcc-c++',
17051705
'libtool', 'log4cplus-devel', 'make',
1706-
'openssl-devel']
1706+
'openssl-devel', 'bison', 'flex']
17071707

17081708
if revision in ['7', '8']:
17091709
# Install newer version of Boost in case users want to opt-in with:
@@ -1714,7 +1714,7 @@ def install_packages_local(system, revision, features, check_times, ignore_error
17141714
packages.extend(['python3-sphinx', 'python3-sphinx_rtd_theme'])
17151715

17161716
if 'native-pkg' in features:
1717-
packages.extend(['bison', 'flex', 'python3-devel', 'rpm-build'])
1717+
packages.extend(['python3-devel', 'rpm-build'])
17181718

17191719
if 'mysql' in features:
17201720
packages.extend(['mariadb', 'mariadb-server'])
@@ -1752,7 +1752,7 @@ def link_pg_config():
17521752
elif system == 'rhel':
17531753
packages = ['autoconf', 'automake', 'boost-devel', 'gcc-c++',
17541754
'libtool', 'log4cplus-devel', 'make',
1755-
'openssl-devel']
1755+
'openssl-devel', 'bison', 'flex']
17561756

17571757
if revision in ['7', '8']:
17581758
# Install newer version of Boost in case users want to opt-in with:
@@ -1769,7 +1769,7 @@ def link_pg_config():
17691769
env=env, timeout=120, check_times=check_times)
17701770

17711771
if 'native-pkg' in features:
1772-
packages.extend(['bison', 'flex', 'python3-devel', 'rpm-build'])
1772+
packages.extend(['python3-devel', 'rpm-build'])
17731773

17741774
if 'mysql' in features:
17751775
packages.extend(['mariadb', 'mariadb-server'])
@@ -1815,7 +1815,7 @@ def link_pg_config():
18151815
packages.extend(['python3-sphinx', 'python3-sphinx_rtd_theme'])
18161816

18171817
if 'native-pkg' in features:
1818-
packages.extend(['bison', 'flex', 'python3-devel', 'rpm-build'])
1818+
packages.extend(['python3-devel', 'rpm-build'])
18191819

18201820
if 'mysql' in features:
18211821
packages.extend(['mariadb', 'mariadb-server', 'mariadb-connector-c-devel'])
@@ -1854,7 +1854,7 @@ def link_pg_config():
18541854

18551855
if 'native-pkg' in features:
18561856
packages.extend(['build-essential', 'fakeroot', 'devscripts'])
1857-
packages.extend(['bison', 'debhelper', 'flex', 'libboost-dev', 'python3-dev'])
1857+
packages.extend(['debhelper', 'libboost-dev', 'python3-dev'])
18581858
if 20.04 <= float(revision):
18591859
packages.extend(['dh-python'])
18601860

@@ -1890,7 +1890,7 @@ def link_pg_config():
18901890
_apt_update(system, revision, env=env, check_times=check_times, attempts=3, sleep_time_after_attempt=10)
18911891

18921892
packages = ['gcc', 'g++', 'make', 'autoconf', 'automake', 'libtool', 'libssl-dev',
1893-
'liblog4cplus-dev', 'libboost-system-dev', 'gnupg']
1893+
'liblog4cplus-dev', 'libboost-system-dev', 'gnupg', 'bison', 'flex']
18941894

18951895
if 'docs' in features:
18961896
packages.extend(['python3-sphinx', 'python3-sphinx-rtd-theme',
@@ -1906,7 +1906,7 @@ def link_pg_config():
19061906

19071907
if 'native-pkg' in features:
19081908
packages.extend(['build-essential', 'fakeroot', 'devscripts'])
1909-
packages.extend(['bison', 'debhelper', 'flex', 'libboost-dev', 'python3-dev'])
1909+
packages.extend(['debhelper', 'libboost-dev', 'python3-dev'])
19101910
if int(revision) >= 11:
19111911
packages.extend(['dh-python'])
19121912

@@ -1944,7 +1944,7 @@ def link_pg_config():
19441944
execute('sudo pkg clean -a -y')
19451945
execute('sudo pkg install -y pkg')
19461946

1947-
packages = ['autoconf', 'automake', 'libtool', 'openssl', 'log4cplus', 'boost-libs', 'wget']
1947+
packages = ['autoconf', 'automake', 'bison', 'flex', 'libtool', 'openssl', 'log4cplus', 'boost-libs', 'wget']
19481948

19491949
if revision.startswith('14'):
19501950
packages.extend(['bash', 'pkgconf'])
@@ -1998,7 +1998,7 @@ def link_pg_config():
19981998

19991999
packages = ['gcc', 'g++', 'make', 'autoconf', 'automake', 'libtool', 'openssl-dev',
20002000
'boost-libs', 'boost-dev', 'procps', 'tar', 'log4cplus', 'log4cplus-dev',
2001-
'gzip']
2001+
'gzip', 'bison', 'flex']
20022002

20032003
if 'docs' in features:
20042004
packages.extend(['py3-sphinx py3-sphinx_rtd_theme'])
@@ -2014,13 +2014,12 @@ def link_pg_config():
20142014

20152015
if 'pgsql' in features:
20162016
packages.extend(['postgresql-dev', 'postgresql'])
2017-
packages.extend(['bison', 'flex', 'boost-dev', 'python3-dev'])
20182017

20192018
if 'gssapi' in features:
20202019
packages.extend(['krb5-dev'])
20212020

20222021
if 'native-pkg' in features:
2023-
packages.extend(['alpine-sdk'])
2022+
packages.extend(['alpine-sdk', 'python3-dev'])
20242023

20252024
if 'ccache' in features:
20262025
packages.extend(['ccache'])

0 commit comments

Comments
 (0)