diff options
| author | Daniel Black <daniel@mariadb.org> | 2020-08-07 14:59:48 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2020-08-08 09:28:12 +1000 |
| commit | 7482720fb71fd7aa3eab153bbcce6edc6e14de78 (patch) | |
| tree | 8215665f347aa51a04f57a05735a9ddb89262769 | |
| parent | 1adced48c525fb982a1e4771acc839fcbf140e59 (diff) | |
| download | mariadb-git-7482720fb71fd7aa3eab153bbcce6edc6e14de78.tar.gz | |
debian: remove gcc check. don't package rocksdb on x86_32
| -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 928c67717c0..2e03d1cfa19 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 |