mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
MDEV-34261: Detect if build is running under 32-bit container
When building on 64-bit kernel machine in 32-bit docker container CMake falsely (but it works as expected) detects that container runtime in also 64-bits. Use linux32 command to change runtime enviroment to 32-bit and then CMake will correctly disable for example ColumnStore and not try to build it This commit only works with debian/autobake-debs.sh
This commit is contained in:
parent
58a0e1e3dd
commit
b204817986
1 changed files with 9 additions and 0 deletions
9
debian/autobake-deb.sh
vendored
9
debian/autobake-deb.sh
vendored
|
@ -62,6 +62,7 @@ replace_uring_with_aio()
|
|||
}
|
||||
|
||||
architecture=$(dpkg-architecture -q DEB_BUILD_ARCH)
|
||||
uname_machine=$(uname -m)
|
||||
|
||||
# Parse release name and number from Linux standard base release
|
||||
# Example:
|
||||
|
@ -161,6 +162,14 @@ then
|
|||
BUILDPACKAGE_DPKGCMD+=("eatmydata")
|
||||
fi
|
||||
|
||||
# If running autobake-debs.sh inside docker/podman host machine which
|
||||
# has 64 bits cpu but container image is 32 bit make sure that we set
|
||||
# correct arch with linux32 for 32 bit enviroment
|
||||
if [ "$architecture" = "i386" ] && [ "$uname_machine" = "x86_64" ]
|
||||
then
|
||||
BUILDPACKAGE_DPKGCMD+=("linux32")
|
||||
fi
|
||||
|
||||
BUILDPACKAGE_DPKGCMD+=("dpkg-buildpackage")
|
||||
|
||||
# Using dpkg-buildpackage args
|
||||
|
|
Loading…
Add table
Reference in a new issue