diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-12 14:39:53 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-12 14:39:53 +0300 |
| commit | 0e34bb3e97f6707b6b66ff366184f0921b4049d5 (patch) | |
| tree | 67cfea578ad61baa789c37aa68b3a935ab75a8b3 /debian/autobake-deb.sh | |
| parent | 1ddff751ebe45d6d6732e1e2ee7014268bfb18c1 (diff) | |
| parent | 602d3dafa9496cd6996a787a4f16c4ab140f2ac2 (diff) | |
| download | mariadb-git-0e34bb3e97f6707b6b66ff366184f0921b4049d5.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'debian/autobake-deb.sh')
| -rwxr-xr-x | debian/autobake-deb.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 4417f18ded0..0d6234c584a 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -50,12 +50,10 @@ then sed "/Package: libmariadbd-dev/,/^$/d" -i debian/control fi -# Convert gcc version to numberical value. Format is Mmmpp where M is Major -# version, mm is minor version and p is patch. -# -dumpfullversion & -dumpversion to make it uniform across old and new (>=7) -GCCVERSION=$(gcc -dumpfullversion -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' \ - -e 's/\.\([0-9]\)/0\1/g' \ - -e 's/^[0-9]\{3,4\}$/&00/') +if [[ $(arch) =~ i[346]86 ]] +then + sed "/Package: mariadb-plugin-rocksdb/,/^$/d" -i debian/control +fi # If rocksdb-tools is not available (before Debian Buster and Ubuntu Disco) # remove the dependency from the RocksDB plugin so it can install properly |