Refactor build scripts to improve dependency handling and fix URL in gettext unarchive

Author: mxcl

brewkit/build-template.ts

@@ -28,7 +28,7 @@ console.error("%cresolved:", "color: yellow", `${pkg.project}=${version.version}
 set_active_pkg({ project: pkg.project, version: version.version });
 
 const SEP = Deno.build.os == "windows" ? ";" : ":";
-const deps_prefixes = (Deno.env.get("PKGS") || "").split(SEP).compact(Path.abs);
+let deps_prefixes = (Deno.env.get("PKGS") || "").split(SEP).compact(Path.abs);
 const deps = deps_prefixes.reduce((acc, prefix) => {
   const version = new SemVer(prefix.basename());
   const project = prefix.parent().relative({ to: PKGX_DIR }).replaceAll("\\", "/");
@@ -85,6 +85,11 @@ if (Deno.build.os != "windows") {
 
     // ensure we continue to use pre-downloaded deps
     Deno.env.set("PKGX_DIR", dstdir.string);
+
+    deps_prefixes = deps_prefixes.map((prefix) => {
+      const relpath = prefix.relative({ to: PKGX_DIR });
+      return dstdir.join(relpath);
+    });
   }
 
   await fixup(

brewkit/fixups/rpath-fixer.ts

@@ -27,6 +27,7 @@ export default class RpathFixer {
     switch (Deno.build.os) {
       case "linux":
         for (const file of this.files) {
+          console.error('%c+', 'color:yellow', 'fixing rpaths:', file);
           await this.execute_linux(file);
         }
         break;
@@ -39,6 +40,7 @@ export default class RpathFixer {
         Deno.env.set("GEM_HOME", "/tmp/gem");
 
         for (const file of this.files) {
+          console.error('%c+', 'color:yellow', 'fixing rpaths:', file);
           Deno.env.set("LIBS", JSON.stringify(this.files));
           run`${script} ${file} ${this.prefix} ${this.PKGX_DIR}`;
         }
@@ -49,6 +51,8 @@ export default class RpathFixer {
   async execute_linux(file: Path) {
     let rpaths: string[] = [];
 
+    console.error(this.deps_prefixes);
+
     const LDLPATH = [
       this.prefix.join("lib"),
       ...this.deps_prefixes.map((prefix) => prefix.join("lib")),

projects/gnu.org/gettext/build.ts

@@ -1,7 +1,7 @@
 import { BuildOptions, inreplace, run, unarchive } from "brewkit";
 
 export default async function ({ prefix, tag }: BuildOptions) {
-  await unarchive(`https://ftp.gnu.org/gnu/gettext/gettext-${tag.slice(1)}.tar.gz`);
+  await unarchive(`https://ftp.gnu.org/gnu/gettext/gettext-${tag}.tar.gz`);
   run`./configure
         --prefix=${prefix}
         --disable-debug

projects/perl.org/build.ts

@@ -26,7 +26,7 @@ export default async function ({ prefix, version }: BuildOptions) {
     run`make --jobs ${navigator.hardwareConcurrency} install`;
 
     const sitearchexp = await (async () => {
-      for await (const [path, { name }] of prefix.lib.join(`perl5/${version}`).ls()) {
+      for await (const [path, { name }] of prefix.lib.join(`${version}`).ls()) {
         if (name.includes("thread-multi")) {
           return path;
         }