@@ -1675,11 +1675,9 @@ def install_packages_local(system, revision, features, check_times, ignore_error
1675
1675
packages .extend (['mariadb' , 'mariadb-server' , 'mariadb-connector-c-devel' ])
1676
1676
1677
1677
if 'pgsql' in features :
1678
- if int (revision ) >= 30 :
1679
- packages .extend (['postgresql-server-devel' ])
1680
1678
if int (revision ) <= 34 :
1681
1679
packages .extend (['postgresql-devel' ])
1682
- packages .extend (['postgresql-server' ])
1680
+ packages .extend (['postgresql-server' , 'postgresql-server-devel' ])
1683
1681
1684
1682
if 'gssapi' in features :
1685
1683
packages .extend (['krb5-devel' ])
@@ -1893,16 +1891,14 @@ def link_pg_config():
1893
1891
'liblog4cplus-dev' , 'libboost-system-dev' , 'gnupg' , 'bison' , 'flex' ]
1894
1892
1895
1893
if 'docs' in features :
1896
- packages .extend (['python3-sphinx' , 'python3-sphinx-rtd-theme' ,
1894
+ packages .extend (['python3-sphinx' , 'python3-sphinx-rtd-theme' , 'doxygen' , 'graphviz' ,
1897
1895
'tex-gyre' , 'texlive' , 'texlive-latex-extra' ])
1898
1896
1899
1897
if 'unittest' in features :
1900
1898
packages .append ('googletest' )
1901
1899
1902
1900
if 'netconf' in features :
1903
- packages .extend (['cmake' , 'git' , 'libpcre2-dev' ])
1904
- if revision == '12' :
1905
- packages .extend (['doxygen' , 'graphviz' , 'pkg-config' ])
1901
+ packages .extend (['cmake' , 'git' , 'libpcre2-dev' , 'pkg-config' ])
1906
1902
1907
1903
if 'native-pkg' in features :
1908
1904
packages .extend (['build-essential' , 'fakeroot' , 'devscripts' ])
@@ -1911,18 +1907,17 @@ def link_pg_config():
1911
1907
packages .extend (['dh-python' ])
1912
1908
1913
1909
if 'mysql' in features :
1914
- if revision == '8' :
1915
- packages .extend (['mysql-client' , 'libmysqlclient-dev' ])
1916
- else :
1917
- packages .extend (['default-mysql-client-core' , 'default-libmysqlclient-dev' ])
1918
- if revision in ['8' , '9' ]:
1910
+ packages .extend (['default-mysql-client-core' , 'default-libmysqlclient-dev' ])
1911
+ if int (revision ) <= 8 :
1912
+ packages .extend (['mysql-client' , 'libmysqlclient-dev' , 'mysql-server' ])
1913
+ elif int (revision ) <= 9 :
1919
1914
packages .append ('mysql-server' )
1920
1915
else :
1921
1916
packages .append ('mariadb-server' )
1922
1917
1923
1918
if 'pgsql' in features :
1924
1919
packages .extend (['postgresql-client' , 'libpq-dev' ])
1925
- if revision == '8' :
1920
+ if int ( revision ) <= 8 :
1926
1921
packages .extend (['postgresql' , 'postgresql-client' ])
1927
1922
else :
1928
1923
packages .append ('postgresql-all' )
@@ -2113,22 +2108,7 @@ def _build_binaries_and_run_ut(system, revision, features, tarball_path, env, ch
2113
2108
if 'pgsql' in features :
2114
2109
cmd += ' --with-pgsql'
2115
2110
if 'unittest' in features :
2116
- # prepare gtest switch - use downloaded gtest sources only if it is not present as native package
2117
- if system in ['centos' , 'fedora' , 'rhel' , 'freebsd' , 'alpine' , 'rocky' ]:
2118
- cmd += ' --with-gtest-source=/usr/src/googletest-release-1.10.0/googletest/'
2119
- elif system == 'debian' and revision == '8' :
2120
- cmd += ' --with-gtest-source=/usr/src/googletest-release-1.10.0/googletest/'
2121
- elif system == 'debian' :
2122
- cmd += ' --with-gtest-source=/usr/src/googletest/googletest'
2123
- elif system == 'ubuntu' :
2124
- if revision .startswith ('16.' ):
2125
- cmd += ' --with-gtest-source=/usr/src/googletest-release-1.10.0/googletest/'
2126
- else :
2127
- cmd += ' --with-gtest-source=/usr/src/googletest/googletest'
2128
- elif system == 'arch' :
2129
- pass
2130
- else :
2131
- raise NotImplementedError ('no implementation for %s' % system )
2111
+ cmd += ' --with-gtest-source=/usr/src/googletest'
2132
2112
if 'docs' in features and not system == 'rhel' :
2133
2113
cmd += ' --enable-generate-docs'
2134
2114
if 'gssapi' in features :
0 commit comments