Skip to content

Commit 803fa4b

Browse files
committed
MCOL-4535: Clean up libreadline as ColumnStore no longer needs it
Keep the readline installation step in Salsa-CI stages that install MariaDB.org packages in Debian Sid (or releases after is, such as Debian 11 "Bullseye" or Ubuntu 21.04 "Hirsute") as those old packages still depend on readline for the MariaDB Server itself.
1 parent e0d61cb commit 803fa4b

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

debian/autobake-deb.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@ then
2424
echo >> debian/control
2525
cat storage/columnstore/columnstore/debian/control >> debian/control
2626

27-
# From Debian Bullseye/Ubuntu Hirsute onwards libreadline is gone, so build with it
28-
# only on older releases where it is still available. This can be removed once
29-
# MCOL-4535 lands in MariaDB.
30-
if apt-cache madison libreadline-gplv2-dev | grep 'libreadline-gplv2-dev' >/dev/null 2>&1
31-
then
32-
sed 's/libpcre2-dev,/libpcre2-dev, libreadline-gplv2-dev [amd64],/' -i debian/control
33-
fi
34-
3527
# ColumnStore is explcitly disabled in the native build, so allow it now
3628
# when build it when triggered by autobake-deb.sh
3729
sed '/-DPLUGIN_COLUMNSTORE=NO/d' -i debian/rules

debian/salsa-ci.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,6 @@ build:
3737
- apt-get update && eatmydata apt-get install --yes --no-install-recommends aptitude devscripts ccache equivs
3838
- cd ${WORKING_DIR}/${SOURCE_DIR}
3939
- eatmydata install-build-deps.sh .
40-
- |
41-
# From Debian Bullseye/Ubuntu Hirsute onwards libreadline is gone, so build with it
42-
# only on older releases where it is still available. This can be removed once
43-
# MCOL-4535 lands in MariaDB.
44-
if apt-cache madison libreadline-gplv2-dev | grep 'libreadline-gplv2-dev' >/dev/null 2>&1
45-
then
46-
apt-get install --yes libreadline-gplv2-dev
47-
fi
4840
- update-ccache-symlinks; ccache -z # Zero out ccache counters
4941
- while true; do sleep 600; echo "10 minutes passed" >&2; done & # Progress keeper since build is long and silent
5042
- debian/autobake-deb.sh |& tail -n 10000 # Keep Gitlab-CI output under 4 MB

0 commit comments

Comments
 (0)