BuildSystem: Always download cmake instead of using host's
If cmake was installed from snap, build system would cause an error because some libfakeroot GLIBC requirement.
This commit is contained in:
@@ -6,11 +6,6 @@ source $BANAN_SCRIPT_DIR/config.sh
|
||||
|
||||
FAKEROOT_FILE="$BANAN_BUILD_DIR/fakeroot-context"
|
||||
|
||||
if [[ -z $CMAKE_COMMAND ]]; then
|
||||
echo "No usable cmake binary found" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
run_fakeroot() {
|
||||
fakeroot -i $FAKEROOT_FILE -s $FAKEROOT_FILE -- /bin/bash -c '$@' bash $@
|
||||
}
|
||||
@@ -19,11 +14,21 @@ make_build_dir () {
|
||||
mkdir -p $BANAN_BUILD_DIR
|
||||
cd $BANAN_BUILD_DIR
|
||||
if ! [[ -f "build.ninja" ]]; then
|
||||
$CMAKE_COMMAND --toolchain=$BANAN_TOOLCHAIN_DIR/Toolchain.txt -G Ninja $BANAN_ROOT_DIR
|
||||
$BANAN_CMAKE --toolchain=$BANAN_TOOLCHAIN_DIR/Toolchain.txt -G Ninja $BANAN_ROOT_DIR
|
||||
fi
|
||||
}
|
||||
|
||||
build_target () {
|
||||
if ! [[ -f $BANAN_CMAKE ]]; then
|
||||
echo "cmake not found, please re-run toolchain compilation script"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ! type ninja &> /dev/null ; then
|
||||
echo "ninja not found" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
make_build_dir
|
||||
if [[ $# -eq 0 ]]; then
|
||||
echo "No target provided"
|
||||
@@ -34,15 +39,6 @@ build_target () {
|
||||
}
|
||||
|
||||
build_toolchain () {
|
||||
if [[ -f $BANAN_TOOLCHAIN_PREFIX/bin/$BANAN_TOOLCHAIN_TRIPLE_PREFIX-gcc ]]; then
|
||||
echo "You already seem to have a toolchain."
|
||||
read -e -p "Do you want to rebuild it [y/N]? " choice
|
||||
if ! [[ "$choice" == [Yy]* ]]; then
|
||||
echo "Aborting toolchain rebuild"
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
$BANAN_TOOLCHAIN_DIR/build.sh
|
||||
}
|
||||
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
CMAKE_VERSION_REQUIRED="3.26"
|
||||
|
||||
version_atleast() {
|
||||
[ "$1" = "$(echo -e "$1\n$2" | sort -rV | head -n1)" ]
|
||||
}
|
||||
|
||||
download_cmake() {
|
||||
read -e -p "Do you want to download it [y/N]? " choice
|
||||
if ! [[ "$choice" == [Yy]* ]]; then
|
||||
echo "Build requirements not met" >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
CMAKE_FULL_NAME="cmake-3.26.6-linux-x86_64"
|
||||
|
||||
mkdir -p $BANAN_BUILD_DIR/toolchain
|
||||
mkdir -p $BANAN_TOOLCHAIN_PREFIX/bin
|
||||
mkdir -p $BANAN_TOOLCHAIN_PREFIX/share
|
||||
cd $BANAN_BUILD_DIR/toolchain
|
||||
|
||||
if ! [[ -f $CMAKE_FULL_NAME.tar.gz ]]; then
|
||||
wget https://cmake.org/files/v3.26/$CMAKE_FULL_NAME.tar.gz
|
||||
fi
|
||||
|
||||
if ! [[ -d $CMAKE_FULL_NAME ]]; then
|
||||
tar xf $CMAKE_FULL_NAME.tar.gz
|
||||
fi
|
||||
|
||||
cp -r $CMAKE_FULL_NAME/bin/* $BANAN_TOOLCHAIN_PREFIX/bin/
|
||||
cp -r $CMAKE_FULL_NAME/share/* $BANAN_TOOLCHAIN_PREFIX/share/
|
||||
|
||||
export CMAKE_COMMAND="$BANAN_TOOLCHAIN_PREFIX/bin/cmake"
|
||||
}
|
||||
|
||||
if ! type ninja &> /dev/null ; then
|
||||
echo "ninja not found" >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [ -z "$CMAKE_COMMAND" ]; then
|
||||
if [ -f $BANAN_TOOLCHAIN_PREFIX/bin/cmake ]; then
|
||||
export CMAKE_COMMAND="$BANAN_TOOLCHAIN_PREFIX/bin/cmake"
|
||||
else
|
||||
export CMAKE_COMMAND=cmake
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! type $CMAKE_COMMAND &> /dev/null ; then
|
||||
echo "You don't seem to have cmake installed"
|
||||
download_cmake
|
||||
return 0
|
||||
fi
|
||||
|
||||
CMAKE_VERSION=$($CMAKE_COMMAND --version | head -n1 | cut -d' ' -f3)
|
||||
if ! version_atleast "$CMAKE_VERSION" "$CMAKE_VERSION_REQUIRED" ; then
|
||||
echo "Your cmake version ($CMAKE_VERSION) is less than the required $CMAKE_VERSION_REQUIRED"
|
||||
download_cmake
|
||||
return 0
|
||||
fi
|
||||
@@ -30,4 +30,4 @@ if [[ -z $BANAN_BOOTLOADER ]]; then
|
||||
export BANAN_BOOTLOADER="BANAN"
|
||||
fi
|
||||
|
||||
source $BANAN_SCRIPT_DIR/check-requirements.sh
|
||||
export BANAN_CMAKE=$BANAN_TOOLCHAIN_PREFIX/bin/cmake
|
||||
|
||||
@@ -25,8 +25,8 @@ if [ -z $BANAN_ROOT_DIR ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z $CMAKE_COMMAND ]; then
|
||||
echo "You must set the CMAKE_COMMAND environment variable" >&2
|
||||
if [ -z $BANAN_CMAKE ]; then
|
||||
echo "You must set the BANAN_CMAKE environment variable" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -77,7 +77,7 @@ install_banan_legacy() {
|
||||
if [ ! -d $INSTALLER_BUILD_DIR ]; then
|
||||
mkdir -p $INSTALLER_BUILD_DIR
|
||||
cd $INSTALLER_BUILD_DIR
|
||||
$CMAKE_COMMAND -G Ninja ../..
|
||||
$BANAN_CMAKE -G Ninja ../..
|
||||
fi
|
||||
|
||||
cd $INSTALLER_BUILD_DIR
|
||||
|
||||
Reference in New Issue
Block a user