summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorOtto Kekäläinen <otto@kekalainen.net>2021-03-15 11:33:15 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-03-15 11:34:02 +0200
commit211e9b3e0a308094d8f71a7eb4e7fe9c64e3a911 (patch)
tree214fe17078ba04e3c5cc4fc8d727c1f24f836d34 /cmake
parent783625d78f5072a4f986f079628535dc70d7e99f (diff)
downloadmariadb-git-211e9b3e0a308094d8f71a7eb4e7fe9c64e3a911.tar.gz
MDEV-24927: Deb: Use liburing-dev instead of libaio-dev
Updating the debian/control file will automatically update the dependencies in all CI environments that directly read the debian/control file, such as Salsa-CI and buildbot.mariadb.org to some degree. (https://github.com/MariaDB/mariadb.org-tools/issues/43) On Debian/Ubuntu releases that don't have liburing-dev available, automatically downgrade to libaio-dev (just like libcurl4->3 is done). This ensures the debian/control file is always up-to-date and works for latest Debian and Ubuntu releases, while the backwards compatibility mods are maintained in autobake-deb.sh separately, and can be dropped from there once support for certain platforms end. Debian/Ubuntu availability visible at: - https://packages.debian.org/search?searchon=names&keywords=liburing-dev - https://packages.ubuntu.com/search?searchon=names&keywords=liburing-dev Also modify debian/rules to force a build without libaio. Use YES instead of ON to make the flag more logical (=turning libaio check "off"). Stop running Salsa-CI for Debian Stretch-backports, as it does not have liburing-dev available nor is the old-old Debian stable a relevant platform for MariaDB 10.6 to test against anymore. Since the Stretch-backports build can no longer be made, neither can the MySQL 5.7 on Bionic upgrade test be run, as it depended on the Stretch binary. This commit does not modify the .travis.yml file, as Travis-CI does not have new enough Ubuntu releases available yet. Also Travis-CI.org is practically dead now as build times have been shrunk to near zero. The scope of this change is also Debian/Ubuntu only. No RPM or Windows or Mac changes are included in this commit. This commit does not update the external libmariadb or ColumnStore CI pipelines, as those are maintained in different repositories.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/build_configurations/mysql_release.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index 0b4a389db6d..d9e0b490bd7 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -149,7 +149,7 @@ IF(UNIX)
RedHat/Fedora/Oracle Linux: yum install libaio-devel
SuSE: zypper install libaio-devel
- If you really do not want it, pass -DIGNORE_AIO_CHECK=ON to cmake.
+ If you really do not want it, pass -DIGNORE_AIO_CHECK=YES to cmake.
")
ENDIF()