Skip to content

Commit 13b9788

Browse files
illuusiogrooverdan
authored andcommitted
MDEV-27965: MariaDB needs at least libfmt version 7.0
Add requirement in Debian control file for libfmt 7.0 which is needed for building MariaDB. This supports the SFORMAT function added in MDEV-25015. + autobake-deb.sh so old Debian/Ubuntu still bundle the libfmt pulled in from upstream. Closes #2062
1 parent 8b92e34 commit 13b9788

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

debian/autobake-deb.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ disable_pmem()
6565
sed '/-DWITH_PMEM=yes/d' -i debian/rules
6666
}
6767

68+
disable_libfmt()
69+
{
70+
# 0.7+ required
71+
sed '/libfmt-dev/d' -i debian/control
72+
}
73+
6874
architecture=$(dpkg-architecture -q DEB_BUILD_ARCH)
6975

7076
CODENAME="$(lsb_release -sc)"
@@ -77,6 +83,7 @@ case "${CODENAME}" in
7783
disable_pmem
7884
;&
7985
buster)
86+
disable_libfmt
8087
replace_uring_with_aio
8188
if [ ! "$architecture" = amd64 ]
8289
then
@@ -106,6 +113,7 @@ case "${CODENAME}" in
106113
;&
107114
focal)
108115
replace_uring_with_aio
116+
disable_libfmt
109117
;&
110118
impish|jammy)
111119
# mariadb-plugin-rocksdb s390x not supported by us (yet)

debian/control

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Build-Depends: bison,
2323
libcurl4-openssl-dev | libcurl4-dev,
2424
libedit-dev,
2525
libedit-dev:native,
26+
libfmt-dev (>= 7.0.0),
2627
libjemalloc-dev [linux-any],
2728
libjudy-dev,
2829
libkrb5-dev,

0 commit comments

Comments
 (0)