diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-20 12:38:25 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-20 12:38:25 +0300 |
commit | 0c0a56902898038726342ae11decf4bf5421d339 (patch) | |
tree | ed1f66692ac80cce3d168831a72f22100f5ee928 /cmake | |
parent | ef784c4ea2ce93bc8cdd953e84456e69f5875dda (diff) | |
parent | 5dcc56be4d9979e9be927b68f4e62df7a6c3d5a1 (diff) | |
download | mariadb-git-0c0a56902898038726342ae11decf4bf5421d339.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index a19470e6df1..e4e854d1d20 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -1,5 +1,5 @@ # Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. -# Copyright (c) 2011, 2021, MariaDB Corporation. +# Copyright (c) 2011, 2022, MariaDB Corporation. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -105,12 +105,12 @@ ELSEIF(RPM) SET(SEMODULE_PACKAGE /usr/bin/semodule_package CACHE FILEPATH "") SET(WITH_JEMALLOC "yes" CACHE STRING "") SET(PLUGIN_AUTH_SOCKET YES CACHE STRING "") - IF(RPM MATCHES "fedora|centos|rhel") + IF(RPM MATCHES "fedora|centos|rhel|rocky|alma") SET(WITH_INNODB_BZIP2 OFF CACHE STRING "") SET(WITH_INNODB_LZO OFF CACHE STRING "") SET(WITH_ROCKSDB_BZip2 OFF CACHE STRING "") ENDIF() - IF(RPM MATCHES "opensuse|sles|centos|rhel") + IF(RPM MATCHES "opensuse|sles|centos|rhel|rocky|alma") SET(WITH_INNODB_LZ4 OFF CACHE STRING "") SET(WITH_ROCKSDB_LZ4 OFF CACHE STRING "") SET(GRN_WITH_LZ4 no CACHE STRING "") |