diff --git a/ports/SDL2/build.sh b/ports/SDL2/build.sh index 9eccd77a..b33c28bf 100755 --- a/ports/SDL2/build.sh +++ b/ports/SDL2/build.sh @@ -6,7 +6,7 @@ DOWNLOAD_URL="https://github.com/libsdl-org/SDL/releases/download/release-$VERSI DEPENDENCIES=('mesa' 'libiconv') configure() { - $BANAN_CMAKE --fresh -S . -B build -G Ninja \ + cmake --fresh -S . -B build -G Ninja \ --toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \ -DCMAKE_INSTALL_PREFIX='/usr' \ -DCMAKE_BUILD_TYPE=Release \ @@ -16,9 +16,9 @@ configure() { } build() { - $BANAN_CMAKE --build build || exit 1 + cmake --build build || exit 1 } install() { - $BANAN_CMAKE --install build || exit 1 + cmake --install build || exit 1 } diff --git a/ports/SDL2_image/build.sh b/ports/SDL2_image/build.sh index dd58a235..994e12c7 100755 --- a/ports/SDL2_image/build.sh +++ b/ports/SDL2_image/build.sh @@ -6,7 +6,7 @@ DOWNLOAD_URL="https://github.com/libsdl-org/SDL_image/releases/download/release- DEPENDENCIES=('SDL2' 'libpng' 'libjpeg' 'libtiff' 'libwebp') configure() { - $BANAN_CMAKE --fresh -S . -B build -G Ninja \ + cmake --fresh -S . -B build -G Ninja \ --toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \ -DCMAKE_INSTALL_PREFIX='/usr' \ -DCMAKE_BUILD_TYPE=Release \ @@ -15,9 +15,9 @@ configure() { } build() { - $BANAN_CMAKE --build build || exit 1 + cmake --build build || exit 1 } install() { - $BANAN_CMAKE --install build || exit 1 + cmake --install build || exit 1 } diff --git a/ports/SDL2_mixer/build.sh b/ports/SDL2_mixer/build.sh index f75679c1..f58f9062 100755 --- a/ports/SDL2_mixer/build.sh +++ b/ports/SDL2_mixer/build.sh @@ -6,7 +6,7 @@ DOWNLOAD_URL="https://github.com/libsdl-org/SDL_mixer/releases/download/release- DEPENDENCIES=('SDL2' 'timidity') configure() { - $BANAN_CMAKE --fresh -S . -B build -G Ninja \ + cmake --fresh -S . -B build -G Ninja \ --toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \ -DCMAKE_INSTALL_PREFIX='/usr' \ -DCMAKE_BUILD_TYPE=Release \ @@ -19,9 +19,9 @@ configure() { } build() { - $BANAN_CMAKE --build build || exit 1 + cmake --build build || exit 1 } install() { - $BANAN_CMAKE --install build || exit 1 + cmake --install build || exit 1 } diff --git a/ports/SuperTux/build.sh b/ports/SuperTux/build.sh index 2d7ad827..ca58dab2 100755 --- a/ports/SuperTux/build.sh +++ b/ports/SuperTux/build.sh @@ -7,11 +7,8 @@ TAR_CONTENT="SuperTux-v$VERSION-Source" DEPENDENCIES=('boost' 'SDL2' 'SDL2_image' 'curl' 'openal-soft' 'libvorbis' 'freetype' 'physfs' 'glm') configure() { - mkdir -p build - pushd build - $BANAN_CMAKE \ + cmake --fresh -B build -S . -G Ninja \ --toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \ - -G Ninja --fresh .. \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DINSTALL_SUBDIR_BIN=bin \ @@ -19,14 +16,13 @@ configure() { -DENABLE_OPENGL=OFF \ -DENABLE_BOOST_STATIC_LIBS=ON \ || exit 1 - popd # crashes in `std::ostream::sentry::sentry(std::ostream&)` with shared boost } build() { - $BANAN_CMAKE --build build || exit 1 + cmake --build build || exit 1 } install() { - $BANAN_CMAKE --install build || exit 1 + cmake --install build || exit 1 } diff --git a/ports/SuperTuxKart/build.sh b/ports/SuperTuxKart/build.sh index b8f18c5b..8fefacce 100755 --- a/ports/SuperTuxKart/build.sh +++ b/ports/SuperTuxKart/build.sh @@ -7,7 +7,7 @@ TAR_CONTENT="SuperTuxKart-$VERSION-src" DEPENDENCIES=('SDL2' 'curl' 'openal-soft' 'freetype' 'harfbuzz' 'libvorbis' 'libjpeg' 'libpng' 'zlib') configure() { - $BANAN_CMAKE -B build -S . -G Ninja --fresh \ + cmake --fresh -B build -S . -G Ninja \ --toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ @@ -20,9 +20,9 @@ configure() { } build() { - $BANAN_CMAKE --build build || exit 1 + cmake --build build || exit 1 } install() { - $BANAN_CMAKE --install build || exit 1 + cmake --install build || exit 1 } diff --git a/ports/cmake/build.sh b/ports/cmake/build.sh index 74472095..26fc8330 100755 --- a/ports/cmake/build.sh +++ b/ports/cmake/build.sh @@ -6,9 +6,8 @@ DOWNLOAD_URL="https://github.com/Kitware/CMake/releases/download/v$VERSION/cmake DEPENDENCIES=('openssl' 'libuv' 'make' 'bash') configure() { - $BANAN_CMAKE \ + cmake --fresh -B build -S . -G Ninja \ --toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \ - -B build -GNinja --fresh \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_USE_OPENSSL=ON \ -DCMAKE_USE_SYSTEM_LIBUV=ON \ @@ -18,10 +17,10 @@ configure() { } build() { - $BANAN_CMAKE --build build || exit 1 + cmake --build build || exit 1 } install() { - $BANAN_CMAKE --install build || exit 1 + cmake --install build || exit 1 cp $BANAN_TOOLCHAIN_DIR/cmake-platform/* $BANAN_SYSROOT/usr/share/cmake-3.26/Modules/Platform/ } diff --git a/ports/glm/build.sh b/ports/glm/build.sh index 1fbc7e26..6be343b2 100755 --- a/ports/glm/build.sh +++ b/ports/glm/build.sh @@ -5,9 +5,8 @@ VERSION='1.0.2' DOWNLOAD_URL="https://github.com/g-truc/glm/archive/refs/tags/$VERSION.tar.gz#19edf2e860297efab1c74950e6076bf4dad9de483826bc95e2e0f2c758a43f65" configure() { - $BANAN_CMAKE \ + cmake --fresh -B build -S . -G Ninja \ --toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \ - -B build -G Ninja --fresh . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DGLM_BUILD_TESTS=OFF \ @@ -15,9 +14,9 @@ configure() { } build() { - $BANAN_CMAKE --build build || exit 1 + cmake --build build || exit 1 } install() { - $BANAN_CMAKE --install build || exit 1 + cmake --install build || exit 1 } diff --git a/ports/libuv/build.sh b/ports/libuv/build.sh index 61e49468..96143527 100755 --- a/ports/libuv/build.sh +++ b/ports/libuv/build.sh @@ -6,18 +6,17 @@ DOWNLOAD_URL="https://dist.libuv.org/dist/v$VERSION/libuv-v$VERSION.tar.gz#5f055 TAR_CONTENT="libuv-v$VERSION" configure() { - $BANAN_CMAKE \ + cmake --fresh -B build -S . -G Ninja \ --toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \ - -B build -GNinja --fresh \ -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_TESTING=OFF \ . || exit 1 } build() { - $BANAN_CMAKE --build build || exit 1 + cmake --build build || exit 1 } install() { - $BANAN_CMAKE --install build || exit 1 + cmake --install build || exit 1 } diff --git a/ports/llvm/build.sh b/ports/llvm/build.sh index 09e01b7c..fb2032ee 100755 --- a/ports/llvm/build.sh +++ b/ports/llvm/build.sh @@ -9,7 +9,7 @@ DEPENDENCIES=('zlib' 'zstd') configure() { unset CC CXX LD - $BANAN_CMAKE -B build -S llvm -G Ninja \ + cmake --fresh -B build -S llvm -G Ninja \ --toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -24,7 +24,7 @@ configure() { } build() { - $BANAN_CMAKE --build build || exit 1 + cmake --build build || exit 1 } install() { diff --git a/ports/openal-soft/build.sh b/ports/openal-soft/build.sh index 16b7c86d..6996a285 100755 --- a/ports/openal-soft/build.sh +++ b/ports/openal-soft/build.sh @@ -6,7 +6,7 @@ DOWNLOAD_URL="https://github.com/kcat/openal-soft/archive/refs/tags/$VERSION.tar DEPENDENCIES=('SDL2' 'zlib' 'libsndfile') configure() { - $BANAN_CMAKE -B build -S . -G Ninja --fresh \ + cmake --fresh -B build -S . -G Ninja \ --toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ @@ -17,9 +17,9 @@ configure() { } build() { - $BANAN_CMAKE --build build || exit 1 + cmake --build build || exit 1 } install() { - $BANAN_CMAKE --install build || exit 1 + cmake --install build || exit 1 } diff --git a/ports/physfs/build.sh b/ports/physfs/build.sh index 550a3cd6..300b3530 100755 --- a/ports/physfs/build.sh +++ b/ports/physfs/build.sh @@ -6,9 +6,8 @@ DOWNLOAD_URL="https://github.com/icculus/physfs/archive/refs/tags/release-$VERSI TAR_CONTENT="physfs-release-$VERSION" configure() { - $BANAN_CMAKE \ + cmake --fresh -B build -S . -G Ninja \ --toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \ - -B build -G Ninja --fresh . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DPHYSFS_BUILD_TEST=ON \ @@ -17,9 +16,9 @@ configure() { } build() { - $BANAN_CMAKE --build build || exit 1 + cmake --build build || exit 1 } install() { - $BANAN_CMAKE --install build || exit 1 + cmake --install build || exit 1 } diff --git a/ports/sdl12-compat/build.sh b/ports/sdl12-compat/build.sh index 7ac213d9..87aa2221 100755 --- a/ports/sdl12-compat/build.sh +++ b/ports/sdl12-compat/build.sh @@ -9,17 +9,16 @@ DEPENDENCIES=('SDL2' 'glu') configure() { sed -i 's/CMAKE_INSTALL_FULL_DATAROOTDIR/CMAKE_INSTALL_FULL_DATADIR/' CMakeLists.txt - $BANAN_CMAKE \ + cmake --fresh -B build -S . -G Ninja \ --toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \ - --fresh -GNinja -S . -B build \ -DCMAKE_INSTALL_PREFIX="$BANAN_SYSROOT/usr" \ -DSDL2_INCLUDE_DIR="$BANAN_SYSROOT/usr/include/SDL2" } build() { - $BANAN_CMAKE --build build || exit 1 + cmake --build build || exit 1 } install() { - $BANAN_CMAKE --install build || exit 1 + cmake --install build || exit 1 } diff --git a/ports/zstd/build.sh b/ports/zstd/build.sh index 2cbfed7e..b1321be5 100755 --- a/ports/zstd/build.sh +++ b/ports/zstd/build.sh @@ -5,16 +5,16 @@ VERSION='1.5.7' DOWNLOAD_URL="https://github.com/facebook/zstd/releases/download/v$VERSION/zstd-$VERSION.tar.gz#eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3" configure() { - $BANAN_CMAKE -B _build -S build/cmake -G Ninja \ + cmake --fresh -B _build -S build/cmake -G Ninja \ --toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \ -DCMAKE_INSTALL_PREFIX=/usr \ || exit 1 } build() { - $BANAN_CMAKE --build _build ||exit 1 + cmake --build _build ||exit 1 } install() { - $BANAN_CMAKE --install _build ||exit 1 + cmake --install _build ||exit 1 }