diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-03-08 09:35:03 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-03-10 12:37:20 +1100 |
| commit | 8ea08505a159566848a8dd267d152cb74645d903 (patch) | |
| tree | 52db96e7643701a1636da0060ee8a454ceb1bb14 | |
| parent | 86c1bf118a48dd0bab80346f6d65c112ab2e486d (diff) | |
| download | mariadb-git-8ea08505a159566848a8dd267d152cb74645d903.tar.gz | |
MDEV-28022: Debian stretch has zstd too old
zstd-1.1.3 is needed however stretch has only 1.1.2.
Move to distro version based checks as checks against the
apt-cache are unreliable if there is no cache.
| -rwxr-xr-x | debian/autobake-deb.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index ae9b77a382b..c0153f0d805 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -42,6 +42,14 @@ GCCVERSION=$(gcc -dumpfullversion -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g # Debian policy and targeting Debian Sid. Then case-by-case run in autobake-deb.sh # tests for backwards compatibility and strip away parts on older builders. +CODENAME="$(lsb_release -sc)" +case "${CODENAME}" in + stretch) + # MDEV-28022 libzstd-dev-1.1.3 minimum version + sed -i -e '/libzstd-dev/d' debian/control + ;; +esac + # If libcrack2 (>= 2.9.0) is not available (before Debian Jessie and Ubuntu Trusty) # clean away the cracklib stanzas so the package can build without them. if ! apt-cache madison libcrack2-dev | grep 'libcrack2-dev *| *2\.9' >/dev/null 2>&1 @@ -72,13 +80,6 @@ then sed '/mariadb-service-convert/d' -i debian/mariadb-server-10.3.install fi -# If libzstd-dev is not available (before Debian Stretch and Ubuntu Xenial) -# remove the dependency from server and rocksdb so it can build properly -if ! apt-cache madison libzstd-dev | grep 'libzstd-dev' >/dev/null 2>&1 -then - sed '/libzstd-dev/d' -i debian/control -fi - # The binaries should be fully hardened by default. However TokuDB compilation seems to fail on # Debian Jessie and older and on Ubuntu Xenial and older with the following error message: # /usr/bin/ld.bfd.real: /tmp/ccOIwjFo.ltrans0.ltrans.o: relocation R_X86_64_PC32 against symbol @@ -139,7 +140,6 @@ source ./VERSION UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}" PATCHLEVEL="+maria" LOGSTRING="MariaDB build" -CODENAME="$(lsb_release -sc)" EPOCH="1:" dch -b -D ${CODENAME} -v "${EPOCH}${UPSTREAM}${PATCHLEVEL}~${CODENAME}" "Automatic build with ${LOGSTRING}." |