database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-01 17:39:21 +03:00
Code Activity

Deb: Don't build ColumnStore in native builds, only in autobake-deb.sh

Browse Source 
ColumnStore files and debian/control stanza was removed in 1edd2243, and
thus will not be included in a native build. Also adapt the debian/rules
to follow this same policy and only build ColumnStore in builds triggered
from autobake-deb.sh. Avoiding building ColumnStore in vain saves a lot of
build time and disk space.
This commit is contained in:
Otto Kekäläinen
2020-12-21 10:43:16 +02:00
parent e7c7f5c1bb
commit d180909796
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
debian/autobake-deb.sh vendored
View File

@@ -22,6 +22,9 @@ if [[ -d storage/columnstore/columnstore/debian ]]; then
cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/ cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/
echo >> debian/control echo >> debian/control
cat storage/columnstore/columnstore/debian/control >> debian/control cat storage/columnstore/columnstore/debian/control >> debian/control
# Don't build ColumnStore as part of the native build, only build it when triggered
# by autobake-deb.sh
sed 's|-DPLUGIN_COLUMNSTORE=NO|-DPLUGIN_COLUMNSTORE=YES|' -i debian/rules
fi fi
# General CI optimizations to keep build output smaller # General CI optimizations to keep build output smaller

3
debian/rules vendored
View File

@@ -85,6 +85,8 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
dh_auto_build --builddirectory=builddir-native -- import_executables dh_auto_build --builddirectory=builddir-native -- import_executables
endif endif
# Don't build ColumnStore as part of the native build, only build it when triggered
# by autobake-deb.sh. Saves build time and disk space.
mkdir -p $(BUILDDIR) && cd $(BUILDDIR) && \ mkdir -p $(BUILDDIR) && cd $(BUILDDIR) && \
sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/usr/lib/ccache:/usr/local/bin:/usr/bin:/bin"} \ sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/usr/lib/ccache:/usr/local/bin:/usr/bin:/bin"} \
CC=${CC} \ CC=${CC} \
@@ -99,6 +101,7 @@ endif
-DPLUGIN_TOKUDB=NO \ -DPLUGIN_TOKUDB=NO \
-DPLUGIN_CASSANDRA=NO \ -DPLUGIN_CASSANDRA=NO \
-DPLUGIN_AWS_KEY_MANAGEMENT=NO \ -DPLUGIN_AWS_KEY_MANAGEMENT=NO \
-DPLUGIN_COLUMNSTORE=NO \
-DDEB=$(DEB_VENDOR) ..' -DDEB=$(DEB_VENDOR) ..'
# This is needed, otherwise 'make test' will run before binaries have been built # This is needed, otherwise 'make test' will run before binaries have been built