diff --git a/builder b/builder index 735dee5..74a0441 100755 --- a/builder +++ b/builder @@ -54,6 +54,13 @@ function _create() { --profile:host="../../profiles/stage$1" \ . "${@:2}" } + +function _build() { + _push "packages/$1/" + _create "${@:2}" + _pop + +} function llvm-source() { ## Build the llvm source pkg _push "packages/sources/llvm/" _create "$@" @@ -72,6 +79,10 @@ function gcc() { ## Build the gcc package _pop } +function ninja() { ## Build the gcc package + _build ninja "$@" +} + function help() { ## Print out this help message echo "Commands:" grep -E '^function [a-zA-Z0-9_-]+\(\) \{ ## .*$$' "$0" | \ diff --git a/packages/cmake/.#conanfile.py b/packages/cmake/.#conanfile.py deleted file mode 120000 index d6ca560..0000000 --- a/packages/cmake/.#conanfile.py +++ /dev/null @@ -1 +0,0 @@ -lxsameer@majin.15395:1678886450 \ No newline at end of file diff --git a/packages/cmake/conanfile.py b/packages/cmake/conanfile.py index 156d36b..b6a2a8a 100644 --- a/packages/cmake/conanfile.py +++ b/packages/cmake/conanfile.py @@ -17,7 +17,6 @@ from conan import ConanFile from conan.tools.cmake import CMake, CMakeToolchain, CMakeDeps from conan.tools.files import get -from conan.tools.env import VirtualBuildEnv import os diff --git a/packages/cmake/#conanfile.py# b/packages/ninja/conanfile.py similarity index 76% rename from packages/cmake/#conanfile.py# rename to packages/ninja/conanfile.py index 8ce4460..a5a26d5 100644 --- a/packages/cmake/#conanfile.py# +++ b/packages/ninja/conanfile.py @@ -17,38 +17,46 @@ from conan import ConanFile from conan.tools.cmake import CMake, CMakeToolchain, CMakeDeps from conan.tools.files import get -from conan.tools.env import VirtualBuildEnv import os -class Cmake(ConanFile): - name = "cmake" - version = "3.26.0" +class Ninja(ConanFile): + name = "ninja" + version = "1.11.1" settings = "os", "arch", "build_type", "compiler" - + def requirements(self): if self.settings.compiler == "gcc": self.requires(f"gcc/latest@{self.user}/{self.channel}") self.tool_requires(f"gcc/latest@{self.user}/{self.channel}") + self.tool_requires(f"cmake/3.26.0@{self.user}/{self.channel}") + def source(self): get( self, - f"https://github.com/Kitware/CMake/archive/v{self.version}.tar.gz", + f"https://github.com/ninja-build/ninja/archive/v{self.version}.tar.gz", ) + def configure(self): + self.settings.rm_safe("compiler.cppstd") + def generate(self): tc = CMakeToolchain(self) tc.generate() deps = CMakeDeps(self) deps.generate() + def package_id(self): + # No need to delete those settings here, they were already deleted + pass + def build(self): cmake = CMake(self) cmake.configure( - {"CMAKE_USE_OPENSSL": "OFF", "BUILD_TESTING": "OFF"}, - build_script_folder=f"CMake-{self.version}", + {}, + build_script_folder=f"Ninja-{self.version}", ) cmake.build() cmake.install() diff --git a/profiles/conf b/profiles/conf deleted file mode 100644 index c6e77d6..0000000 --- a/profiles/conf +++ /dev/null @@ -1,3 +0,0 @@ -[conf] -core.download:parallel=10 -tools.build:jobs=2 \ No newline at end of file diff --git a/profiles/stage0 b/profiles/stage0 index bc806ab..6acf1e8 100644 --- a/profiles/stage0 +++ b/profiles/stage0 @@ -1,4 +1,3 @@ -include(conf) {% set gcc_triple = "x86_64-linux-musl" %} [settings]