|
25 | 25 | # Don't build the test package at all to save time and disk space
|
26 | 26 | sed 's|DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test|DINSTALL_MYSQLTESTDIR=false|' -i debian/rules
|
27 | 27 |
|
28 |
| - # Also skip building RocksDB and TokuDB to save even more time and disk space |
29 |
| - sed 's|-DDEB|-DPLUGIN_TOKUDB=NO -DPLUGIN_MROONGA=NO -DPLUGIN_ROCKSDB=NO -DPLUGIN_SPIDER=NO -DPLUGIN_OQGRAPH=NO -DPLUGIN_PERFSCHEMA=NO -DPLUGIN_SPHINX=NO -WITH_EMBEDDED_SERVER=OFF -DDEB|' -i debian/rules |
| 28 | + # Also skip building RocksDB, Mroonga etc to save even more time and disk space |
| 29 | + sed 's|-DDEB|-DPLUGIN_MROONGA=NO -DPLUGIN_ROCKSDB=NO -DPLUGIN_SPIDER=NO -DPLUGIN_OQGRAPH=NO -DPLUGIN_PERFSCHEMA=NO -DPLUGIN_SPHINX=NO -WITH_EMBEDDED_SERVER=OFF -DDEB|' -i debian/rules |
30 | 30 | fi
|
31 | 31 |
|
32 | 32 | # Convert gcc version to numberical value. Format is Mmmpp where M is Major
|
|
65 | 65 | sed 's/libcurl4/libcurl3/g' -i debian/control
|
66 | 66 | fi
|
67 | 67 |
|
68 |
| -# The binaries should be fully hardened by default. However TokuDB compilation seems to fail on |
69 |
| -# Debian Jessie and older and on Ubuntu Xenial and older with the following error message: |
70 |
| -# /usr/bin/ld.bfd.real: /tmp/ccOIwjFo.ltrans0.ltrans.o: relocation R_X86_64_PC32 against symbol |
71 |
| -# `toku_product_name_strings' can not be used when making a shared object; recompile with -fPIC |
72 |
| -# Therefore we need to disable PIE on those releases using gcc as proxy for detection. |
73 |
| -if [[ $GCCVERSION -lt 60000 ]] |
74 |
| -then |
75 |
| - sed 's/hardening=+all$/hardening=+all,-pie/' -i debian/rules |
76 |
| -fi |
77 |
| - |
78 | 68 | # Don't build rocksdb package if gcc version is less than 4.8 or we are running on
|
79 | 69 | # x86 32 bit.
|
80 | 70 | if [[ $GCCVERSION -lt 40800 ]] || [[ $(arch) =~ i[346]86 ]] || [[ $TRAVIS ]]
|
81 | 71 | then
|
82 | 72 | sed '/Package: mariadb-plugin-rocksdb/,/^$/d' -i debian/control
|
83 | 73 | fi
|
84 | 74 |
|
85 |
| -# Always remove aws plugin, see -DNOT_FOR_DISTRIBUTION in CMakeLists.txt |
| 75 | +# Always remove AWS plugin, see -DNOT_FOR_DISTRIBUTION in CMakeLists.txt |
86 | 76 | sed '/Package: mariadb-plugin-aws-key-management-10.2/,/^$/d' -i debian/control
|
87 | 77 |
|
88 |
| -# Don't build cassandra package if thrift is not installed |
| 78 | +# Don't build Cassandra package if Thrift is not installed |
89 | 79 | if [[ ! -f /usr/local/include/thrift/Thrift.h && ! -f /usr/include/thrift/Thrift.h ]]
|
90 | 80 | then
|
91 | 81 | sed '/Package: mariadb-plugin-cassandra/,/^$/d' -i debian/control
|
92 | 82 | fi
|
93 | 83 |
|
| 84 | +# Don't include TokuDB package as it is not built anymore by default (MDEV-19780) |
94 | 85 | sed -i -e "/Package: mariadb-plugin-tokudb/,/^$/d" debian/control
|
95 | 86 |
|
96 | 87 | # If libpcre2-dev is not available (before Debian Stretch and Ubuntu Xenial)
|
|
100 | 91 | sed 's/libpcre2-dev/libpcre3-dev/' -i debian/control
|
101 | 92 | fi
|
102 | 93 |
|
103 |
| -# Mroonga, TokuDB never built on Travis CI anyway, see build flags above |
| 94 | +# Cassandra, Mroonga etc never built on Travis CI anyway, see build flags above |
104 | 95 | if [[ $TRAVIS ]]
|
105 | 96 | then
|
106 |
| - sed -i -e "/Package: mariadb-plugin-tokudb/,/^$/d" debian/control |
107 | 97 | sed -i -e "/Package: mariadb-plugin-mroonga/,/^$/d" debian/control
|
108 | 98 | sed -i -e "/Package: mariadb-plugin-spider/,/^$/d" debian/control
|
109 | 99 | sed -i -e "/Package: mariadb-plugin-oqgraph/,/^$/d" debian/control
|
|
0 commit comments