From c613a0dce34ec88a4fdc52c299885c374cd02ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sun, 15 Feb 2026 22:44:58 +0100 Subject: [PATCH] ninja: switch back build to python3 tests need gtest, so remove. --- dev-build/ninja/ninja-1.13.2.recipe | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/dev-build/ninja/ninja-1.13.2.recipe b/dev-build/ninja/ninja-1.13.2.recipe index 8b1f34ed9..2a77a95c3 100644 --- a/dev-build/ninja/ninja-1.13.2.recipe +++ b/dev-build/ninja/ninja-1.13.2.recipe @@ -9,7 +9,7 @@ it can build LLVM, KDE, Blender, etc." HOMEPAGE="https://ninja-build.org/" COPYRIGHT="2012-2019 Google Inc." LICENSE="Apache v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/ninja-build/ninja/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="974d6b2f4eeefa25625d34da3cb36bdcebe7fbce40f4c16ac0835fd1c0cbae17" @@ -35,10 +35,9 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:as$secondaryArchSuffix - cmd:cmake cmd:g++$secondaryArchSuffix cmd:gcc$secondaryArchSuffix - cmd:make + cmd:python3 " PROVIDES_zsh=" @@ -51,27 +50,17 @@ REQUIRES_zsh=" BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE="Release" \ - $cmakeDirArgs \ - -DCMAKE_INSTALL_BINDIR=$commandBinDir \ - -DINSTALL_GTEST=OFF \ - -Wno-dev - - make -C build $jobArgs + python3 ./configure.py --bootstrap } INSTALL() { - make -C build install + mkdir $commandBinDir + cp ninja $commandBinDir + strip $commandBinDir/ninja # build our zsh completion package mkdir -p $dataDir/zsh/site-functions cp -af $sourceDir/misc/zsh-completion $dataDir/zsh/site-functions/_ninja packageEntries zsh $dataDir } - -TEST() -{ -# [ PASSED ] 410 tests - build/ninja_test -}