profile changes

recipes/limine.py

@@ -10,7 +10,7 @@ source = tarball(
 host_deps = ["autoconf", "automake", "binutils", "gcc"]
 deps = [profile["libc"]]
 
-build_if = profile["arch"] in ("x86_64", "aarch64", "riscv64", "loongarch64")
+build_if = profile.arch in ("x86_64", "aarch64", "riscv64", "loongarch64")
 
 arch_args = {
     "x86_64": [
@@ -25,8 +25,8 @@ arch_args = {
 }
 
 configure, build, install = autotools(
-    configure_args=["--enable-uefi-cd", *arch_args[profile["arch"]]],
-    configure_env={"TOOLCHAIN_FOR_TARGET": profile["triple"] + "-"},
+    configure_args=["--enable-uefi-cd", *arch_args[profile.arch]],
+    configure_env={"TOOLCHAIN_FOR_TARGET": profile.triple + "-"},
 )
 
 subpackages = [
@@ -40,7 +40,7 @@ subpackages = [
     ),
 ]
 
-if profile["arch"] == "x86_64":
+if profile.arch == "x86_64":
     subpackages.append(
         subpackage(
             "limine-bios",

recipes/linux-headers.py

@@ -14,7 +14,7 @@ def build(self):
     # Stage the source into the (writable) build dir before invoking the kernel
     # build system, which is not happy with a read-only source tree.
     self.run("cp", "-rp", f"{self.source_dir}/.", self.build_dir)
-    arch = linux_archs.get(self.profile["arch"], self.profile["arch"])
+    arch = linux_archs.get(self.arch, self.arch)
     self.run("make", "headers_install", f"ARCH={arch}")
     self.run(
         "find",

recipes/linux/recipe.py

@@ -14,8 +14,8 @@ linux_subarchs = {"x86_64": "x86"}
 
 
 def _make(self, *extra):
-    arch = linux_archs.get(self.profile["arch"], self.profile["arch"])
-    subarch = linux_subarchs.get(self.profile["arch"])
+    arch = linux_archs.get(self.arch, self.arch)
+    subarch = linux_subarchs.get(self.arch)
     subarch_arg = (f"SUBARCH={subarch}",) if subarch else ()
     return (
         "make",
@@ -30,7 +30,7 @@ def _make(self, *extra):
 def configure(self):
     self.run("cp", "-rp", f"{self.source_dir}/.", self.build_dir)
     self.run(
-        "cp", self.files / f"config.{self.profile['arch']}", self.build_dir / ".config"
+        "cp", self.files / f"config.{self.arch}", self.build_dir / ".config"
     )
     self.run(*_make(self, "olddefconfig"))
 

recipes/openssl.py

@@ -5,7 +5,7 @@ license = "Apache-2.0"
 url = "https://www.openssl.org/"
 source = tarball(
     url=f"https://github.com/openssl/openssl/releases/download/openssl-{version}/openssl-{version}.tar.gz",
-    sha256="?",
+    sha256="002a2d6b30b58bf4bea46c43bdd96365aaf8daa6c428782aa4feee06da197df3",
 )
 host_deps = ["binutils", "gcc"]
 deps = ["zlib"]
@@ -18,9 +18,9 @@ ossl_targets = {
 
 
 def configure(self):
-    target = ossl_targets.get(self.profile["arch"])
+    target = ossl_targets.get(self.arch)
     if target is None:
-        raise ValueError(f"openssl: unsupported arch {self.profile['arch']}")
+        raise ValueError(f"openssl: unsupported arch {self.arch}")
 
     self.run(
         self.source_dir / "Configure",
@@ -48,6 +48,13 @@ def build(self):
 
 
 def install(self):
+    # OpenSSL's Makefile assigns `DESTDIR=` itself, so an environment DESTDIR is
+    # ignored; it must be passed as a make command-line variable to take effect.
+    # Without this, the (glibc) target libs install straight into the musl
+    # builder's /usr/lib and break it mid-install.
     self.run(
-        "make", "install_sw", "install_ssldirs", env={"DESTDIR": str(self.dest_dir)}
+        "make",
+        "install_sw",
+        "install_ssldirs",
+        f"DESTDIR={self.dest_dir}",
     )

recipes/pkgconf.py

@@ -1,11 +1,11 @@
-version = "3.3.3"
+version = "2.5.1"
 revision = 1
 description = "Lightweight pkg-config implementation"
 license = "ISC"
 url = "http://pkgconf.org/"
 source = tarball(
     url=f"https://distfiles.ariadne.space/pkgconf/pkgconf-{version}.tar.xz",
-    sha256="?",
+    sha256="cd05c9589b9f86ecf044c10a2269822bc9eb001eced2582cfffd658b0a50c243",
 )
 host_deps = ["autoconf", "automake", "binutils", "gcc"]
 deps = [profile["libc"]]