From bf32e418efd405d94b3c0f36597ba8cfcad0d47a Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Thu, 22 Aug 2024 21:09:42 +0200 Subject: [PATCH 1/2] ninja: use bootstrap build option --- packages/python/devel/ninja/package.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/python/devel/ninja/package.mk b/packages/python/devel/ninja/package.mk index 3da72c1b34..755650621a 100644 --- a/packages/python/devel/ninja/package.mk +++ b/packages/python/devel/ninja/package.mk @@ -8,9 +8,13 @@ PKG_SHA256="821bdff48a3f683bc4bb3b6f0b5fe7b2d647cf65d52aeb63328c91a6c6df285a" PKG_LICENSE="Apache" PKG_SITE="https://ninja-build.org/" PKG_URL="https://github.com/ninja-build/ninja/archive/v${PKG_VERSION}.tar.gz" -PKG_DEPENDS_HOST="Python3:host googletest:host" +PKG_DEPENDS_HOST="Python3:host" PKG_LONGDESC="Small build system with a focus on speed" -PKG_TOOLCHAIN="cmake-make" +PKG_TOOLCHAIN="manual" + +make_host() { + python3 ../configure.py --bootstrap +} makeinstall_host() { mkdir -p ${TOOLCHAIN}/bin From 881062fab0fef0406fcb56bcb97feed2045db260 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Thu, 22 Aug 2024 21:11:17 +0200 Subject: [PATCH 2/2] googletest: drop package --- packages/devel/googletest/package.mk | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 packages/devel/googletest/package.mk diff --git a/packages/devel/googletest/package.mk b/packages/devel/googletest/package.mk deleted file mode 100644 index 4438b7ab76..0000000000 --- a/packages/devel/googletest/package.mk +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -# Copyright (C) 2024-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="googletest" -PKG_VERSION="1.14.0" -PKG_SHA256="8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7" -PKG_LICENSE="BSD-3-Clause" -PKG_SITE="https://github.com/google/googletest" -PKG_URL="https://github.com/google/googletest/archive/refs/tags/v${PKG_VERSION}.tar.gz" -PKG_DEPENDS_HOST="ccache:host cmake:host" -PKG_LONGDESC="Google Testing and Mocking Framework" -PKG_TOOLCHAIN="cmake-make"