From 951e3855475b3657334d2c59e100dfbcc7c13743 Mon Sep 17 00:00:00 2001
From: Sameer Rahmani <lxsameer@gnu.org>
Date: Sun, 23 Apr 2023 10:32:32 +0100
Subject: [PATCH] Remove build requirements from base zlib and zstd

---
 conf/base/zlib.py | 6 +-----
 conf/base/zstd.py | 4 ----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/conf/base/zlib.py b/conf/base/zlib.py
index 4df046a..fa4fa78 100644
--- a/conf/base/zlib.py
+++ b/conf/base/zlib.py
@@ -28,10 +28,6 @@ class ZlibBase(ConanFile):
     exports = "*.cmake"
     cmake_setup_file = "zlib_setup.cmake"
 
-    def build_requirements(self):
-        self.tool_requires(f"cmake/{get_version('cmake')}@{self.user}/{self.channel}")
-        self.tool_requires(f"ninja/{get_version('ninja')}@{self.user}/{self.channel}")
-
     def source(self):
         get(
             self,
@@ -41,7 +37,7 @@ class ZlibBase(ConanFile):
     def generate(self):
         tc = CMakeToolchain(self)
         tc.variables["BUILD_SHARED_LIBS"] = False
-        # with_musl_toolchain(self, tc)
+        with_musl_toolchain(self, tc)
         tc.generate()
         deps = CMakeDeps(self)
         deps.generate()
diff --git a/conf/base/zstd.py b/conf/base/zstd.py
index 84ac307..da4d2e0 100644
--- a/conf/base/zstd.py
+++ b/conf/base/zstd.py
@@ -27,10 +27,6 @@ class ZstdBase(ConanFile):
     settings = "os", "arch", "build_type", "compiler"
     exports = "*.cmake"
 
-    def build_requirements(self):
-        self.tool_requires(f"cmake/{get_version('cmake')}@{self.user}/{self.channel}")
-        self.tool_requires(f"ninja/{get_version('ninja')}@{self.user}/{self.channel}")
-
     def source(self):
         get(
             self,