@@ -1661,7 +1661,7 @@ def install_packages_local(system, revision, features, check_times, ignore_error
1661
1661
# prepare fedora
1662
1662
if system == 'fedora' :
1663
1663
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' ]
1665
1665
1666
1666
if 'native-pkg' in features :
1667
1667
packages .extend (['rpm-build' , 'python3-devel' ])
@@ -1703,7 +1703,7 @@ def install_packages_local(system, revision, features, check_times, ignore_error
1703
1703
1704
1704
packages = ['autoconf' , 'automake' , 'boost-devel' , 'gcc-c++' ,
1705
1705
'libtool' , 'log4cplus-devel' , 'make' ,
1706
- 'openssl-devel' ]
1706
+ 'openssl-devel' , 'bison' , 'flex' ]
1707
1707
1708
1708
if revision in ['7' , '8' ]:
1709
1709
# 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
1714
1714
packages .extend (['python3-sphinx' , 'python3-sphinx_rtd_theme' ])
1715
1715
1716
1716
if 'native-pkg' in features :
1717
- packages .extend (['bison' , 'flex' , ' python3-devel' , 'rpm-build' ])
1717
+ packages .extend (['python3-devel' , 'rpm-build' ])
1718
1718
1719
1719
if 'mysql' in features :
1720
1720
packages .extend (['mariadb' , 'mariadb-server' ])
@@ -1752,7 +1752,7 @@ def link_pg_config():
1752
1752
elif system == 'rhel' :
1753
1753
packages = ['autoconf' , 'automake' , 'boost-devel' , 'gcc-c++' ,
1754
1754
'libtool' , 'log4cplus-devel' , 'make' ,
1755
- 'openssl-devel' ]
1755
+ 'openssl-devel' , 'bison' , 'flex' ]
1756
1756
1757
1757
if revision in ['7' , '8' ]:
1758
1758
# Install newer version of Boost in case users want to opt-in with:
@@ -1769,7 +1769,7 @@ def link_pg_config():
1769
1769
env = env , timeout = 120 , check_times = check_times )
1770
1770
1771
1771
if 'native-pkg' in features :
1772
- packages .extend (['bison' , 'flex' , ' python3-devel' , 'rpm-build' ])
1772
+ packages .extend (['python3-devel' , 'rpm-build' ])
1773
1773
1774
1774
if 'mysql' in features :
1775
1775
packages .extend (['mariadb' , 'mariadb-server' ])
@@ -1815,7 +1815,7 @@ def link_pg_config():
1815
1815
packages .extend (['python3-sphinx' , 'python3-sphinx_rtd_theme' ])
1816
1816
1817
1817
if 'native-pkg' in features :
1818
- packages .extend (['bison' , 'flex' , ' python3-devel' , 'rpm-build' ])
1818
+ packages .extend (['python3-devel' , 'rpm-build' ])
1819
1819
1820
1820
if 'mysql' in features :
1821
1821
packages .extend (['mariadb' , 'mariadb-server' , 'mariadb-connector-c-devel' ])
@@ -1854,7 +1854,7 @@ def link_pg_config():
1854
1854
1855
1855
if 'native-pkg' in features :
1856
1856
packages .extend (['build-essential' , 'fakeroot' , 'devscripts' ])
1857
- packages .extend (['bison' , ' debhelper' , 'flex ' , 'libboost-dev' , 'python3-dev' ])
1857
+ packages .extend (['debhelper' , 'libboost-dev' , 'python3-dev' ])
1858
1858
if 20.04 <= float (revision ):
1859
1859
packages .extend (['dh-python' ])
1860
1860
@@ -1890,7 +1890,7 @@ def link_pg_config():
1890
1890
_apt_update (system , revision , env = env , check_times = check_times , attempts = 3 , sleep_time_after_attempt = 10 )
1891
1891
1892
1892
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' ]
1894
1894
1895
1895
if 'docs' in features :
1896
1896
packages .extend (['python3-sphinx' , 'python3-sphinx-rtd-theme' ,
@@ -1906,7 +1906,7 @@ def link_pg_config():
1906
1906
1907
1907
if 'native-pkg' in features :
1908
1908
packages .extend (['build-essential' , 'fakeroot' , 'devscripts' ])
1909
- packages .extend (['bison' , ' debhelper' , 'flex ' , 'libboost-dev' , 'python3-dev' ])
1909
+ packages .extend (['debhelper' , 'libboost-dev' , 'python3-dev' ])
1910
1910
if int (revision ) >= 11 :
1911
1911
packages .extend (['dh-python' ])
1912
1912
@@ -1944,7 +1944,7 @@ def link_pg_config():
1944
1944
execute ('sudo pkg clean -a -y' )
1945
1945
execute ('sudo pkg install -y pkg' )
1946
1946
1947
- packages = ['autoconf' , 'automake' , 'libtool' , 'openssl' , 'log4cplus' , 'boost-libs' , 'wget' ]
1947
+ packages = ['autoconf' , 'automake' , 'bison' , 'flex' , ' libtool' , 'openssl' , 'log4cplus' , 'boost-libs' , 'wget' ]
1948
1948
1949
1949
if revision .startswith ('14' ):
1950
1950
packages .extend (['bash' , 'pkgconf' ])
@@ -1998,7 +1998,7 @@ def link_pg_config():
1998
1998
1999
1999
packages = ['gcc' , 'g++' , 'make' , 'autoconf' , 'automake' , 'libtool' , 'openssl-dev' ,
2000
2000
'boost-libs' , 'boost-dev' , 'procps' , 'tar' , 'log4cplus' , 'log4cplus-dev' ,
2001
- 'gzip' ]
2001
+ 'gzip' , 'bison' , 'flex' ]
2002
2002
2003
2003
if 'docs' in features :
2004
2004
packages .extend (['py3-sphinx py3-sphinx_rtd_theme' ])
@@ -2014,13 +2014,12 @@ def link_pg_config():
2014
2014
2015
2015
if 'pgsql' in features :
2016
2016
packages .extend (['postgresql-dev' , 'postgresql' ])
2017
- packages .extend (['bison' , 'flex' , 'boost-dev' , 'python3-dev' ])
2018
2017
2019
2018
if 'gssapi' in features :
2020
2019
packages .extend (['krb5-dev' ])
2021
2020
2022
2021
if 'native-pkg' in features :
2023
- packages .extend (['alpine-sdk' ])
2022
+ packages .extend (['alpine-sdk' , 'python3-dev' ])
2024
2023
2025
2024
if 'ccache' in features :
2026
2025
packages .extend (['ccache' ])
0 commit comments