deb: columnstore not 32bit (fix stretch)
This corrects the autobake on Stretch Caused by commit 0268b8712288d46fbd8a43fdef6bada399b68dff and commit 3d16e0e16c649505f06b39b7f7e800494ba0fef9. For very strange reasons (still a mistery) the above commits caused the federatedx, archive and blackhole plugins to be missing in the install location even though they where built in the build log. This only occured on Stretch and not recent Ubuntu and Debian distros. The stretch autobake output contained: dh_install: Cannot find (any matches for) "usr/lib/mysql/plugin/ha_archive.so" (tried in "." and "debian/tmp") dh_install: mariadb-server-10.5 missing files: usr/lib/mysql/plugin/ha_archive.so dh_install: Cannot find (any matches for) "usr/lib/mysql/plugin/ha_blackhole.so" (tried in "." and "debian/tmp") dh_install: mariadb-server-10.5 missing files: usr/lib/mysql/plugin/ha_blackhole.so dh_install: Cannot find (any matches for) "usr/lib/mysql/plugin/ha_federatedx.so" (tried in "." and "debian/tmp") dh_install: mariadb-server-10.5 missing files: usr/lib/mysql/plugin/ha_federatedx.sodh_install: Cannot find (any matches for) "usr/lib/mysql/plugin/ha_archive.so" (tried in "." and "debian/tmp") dh_install: mariadb-server-10.5 missing files: usr/lib/mysql/plugin/ha_archive.so dh_install: Cannot find (any matches for) "usr/lib/mysql/plugin/ha_blackhole.so" (tried in "." and "debian/tmp") dh_install: mariadb-server-10.5 missing files: usr/lib/mysql/plugin/ha_blackhole.so dh_install: Cannot find (any matches for) "usr/lib/mysql/plugin/ha_federatedx.so" (tried in "." and "debian/tmp") dh_install: mariadb-server-10.5 missing files: usr/lib/mysql/plugin/ha_federatedx.so
This commit is contained in:
parent
69b75cb3db
commit
a6621867e9
9
debian/autobake-deb.sh
vendored
9
debian/autobake-deb.sh
vendored
@ -24,10 +24,13 @@ then
|
||||
# build less verbose
|
||||
# MCOL-4149: ColumnStore builds are so slow and big that they must be skipped on
|
||||
# both Travis-CI and Gitlab-CI
|
||||
sed -e '/Add support for verbose builds/,/^$/d' \
|
||||
-e '/ColumnStore is part of the build/,/^$/d' \
|
||||
-e 's|$(CMAKEFLAGS)|$(CMAKEFLAGS) -DPLUGIN_COLUMNSTORE=NO|' \
|
||||
sed -e 's|$(CMAKEFLAGS)|$(CMAKEFLAGS) -DPLUGIN_COLUMNSTORE=NO|' \
|
||||
-i debian/rules
|
||||
elif [ -d storage/columnstore/columnstore/debian ]
|
||||
then
|
||||
cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/
|
||||
echo >> debian/control
|
||||
cat storage/columnstore/columnstore/debian/control >> debian/control
|
||||
fi
|
||||
|
||||
# Don't build or try to put files in a package for selected plugins and components on Travis-CI
|
||||
|
9
debian/rules
vendored
9
debian/rules
vendored
@ -70,15 +70,6 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
|
||||
dh_auto_build --builddirectory=builddir-native -- import_executables
|
||||
endif
|
||||
|
||||
# ColumnStore is part of the build
|
||||
ifneq (32,$(DEB_HOST_ARCH_BITS))
|
||||
# Take the files and part of control from MCS directory
|
||||
cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/
|
||||
# Don't include twice
|
||||
grep -q '^Package: mariadb-plugin-columnstore$$' debian/control || \
|
||||
( echo && cat storage/columnstore/columnstore/debian/control ) >> debian/control
|
||||
endif
|
||||
|
||||
echo "server:Version=$(DEB_VERSION)" >> debian/substvars
|
||||
|
||||
# RocksDB and Column Store cannot build on 32-bit platforms
|
||||
|
Loading…
x
Reference in New Issue
Block a user