wip

Author: mxcl

bin/pkg-test

@@ -87,7 +87,12 @@ async function prep_script(srcroot: Path, { pkg }: Installation, tmpdir: Path) {
     import test_runner from '${srcroot.join("projects", pkg.project, "test.ts").fileURL()}';
     import { Path, SemVer } from 'brewkit';
     const prefix = new Path(Deno.args[0]);
-    const version = new SemVer(prefix.basename());
+    const version = new SemVer(Deno.args[1]);
+
+    for (const envln of Deno.args.slice(2)) {
+      const [key, value] = envln.split("=");
+      Deno.env.set(key, value);
+    }
 
     if (Deno.env.get("GITHUB_ACTIONS")) {
       console.log("::group::env");
@@ -121,7 +126,9 @@ async function prep_script(srcroot: Path, { pkg }: Installation, tmpdir: Path) {
   }
 }
 
-async function run(deno: string, srcroot: Path, { path: prefix, pkg }: Installation, tmpdir: Path, env: Record<string, string>) {
+async function run(deno: string, srcroot: Path, { path: prefix, pkg }: Installation, tmpdir: Path, runenv: Record<string, string>) {
+  const env: Record<string, string> = {}
+
   let [cmd, ...args]: string[] = (() => {
     if (Deno.build.os !== 'darwin') return [deno];
 
@@ -173,6 +180,7 @@ async function run(deno: string, srcroot: Path, { path: prefix, pkg }: Installat
     tmpdir.join("run-test.ts").string,
     prefix.string,
     pkg.version.toString(),
+    ...Object.entries(runenv).map((value, key) => `${key}=${value}`),
   );
 
   const cwd = tmpdir.join("testbed").mkdir().string;

brewkit/mod.ts

@@ -231,3 +231,16 @@ export { getVersions as gitlab };
 
 import venvify from "./venvify.ts";
 export { venvify };
+
+export async function tmp<T>(fn: (d: Path) => Promise<T>): Promise<T> {
+  //TODO actually base off of original CWD
+  const tmp = Path.cwd().join(Math.random().toString(36).substring(2, 15))
+    .mkdir();
+  try {
+    Deno.chdir(tmp.string);
+    return await fn(tmp);
+  } finally {
+    Deno.chdir(tmp.parent().string);
+    tmp.rm("rf");
+  }
+}

brewkit/run.ts

@@ -79,15 +79,37 @@ export function backticks_quiet(
 }
 
 function splitArgs(input: string): string[] {
-  const regex = /"([^"]*)"|'([^']*)'|(\S+)/g;
+  // Remove comments
+  input = input.replace(/#.*$/gm, "").trim();
+
   const args: string[] = [];
+  const regex = /(?:[^\s"'=]+=(?:"[^"]*"|'[^']*'|[^\s]+)|"[^"]*"|'[^']*'|[^\s]+)/g;
   let match;
 
-  // Remove comments
-  input = input.replace(/#.*$/gm, "");
-
   while ((match = regex.exec(input)) !== null) {
-    args.push((match[1] || match[2] || match[3]).trim());
+    let token = match[0];
+
+    // Strip outer quotes around right-hand side of `key=val`
+    if (token.includes("=")) {
+      const [key, val] = token.split(/=(.+)/, 2);
+      if (
+        (val.startsWith('"') && val.endsWith('"')) ||
+        (val.startsWith("'") && val.endsWith("'"))
+      ) {
+        args.push(`${key}=${val.slice(1, -1)}`);
+      } else {
+        args.push(token);
+      }
+    } else {
+      // Strip quotes for standalone quoted values
+      if (
+        (token.startsWith('"') && token.endsWith('"')) ||
+        (token.startsWith("'") && token.endsWith("'"))
+      ) {
+        token = token.slice(1, -1);
+      }
+      args.push(token);
+    }
   }
 
   return args;

projects/gnu.org/gcc/build.ts

@@ -18,7 +18,7 @@ export default async function build({ prefix, version }: BuildOptions) {
         --enable-lto
   #TODO --with-system-zlib
         --with-bugurl=https://github.com/pkgxdev/manifests/issues
-        "--with-pkgversion=pkgx GCC ${version}"
+        --with-pkgversion="pkgx GCC ${version}"
         `;
   run`make --jobs ${navigator.hardwareConcurrency}`;
   run`make install-strip`;

projects/gnu.org/glibc/build.ts

@@ -1,29 +1,34 @@
-import { BuildOptions, env_include, Path, run, stub, unarchive } from "brewkit";
+import { BuildOptions, env_include, Path, run, stub, unarchive, tmp } from "brewkit";
 
 export default async function ({ prefix, tag, version }: BuildOptions) {
   await unarchive(`http://ftp.gnu.org/gnu/libc/glibc-${tag}.tar.gz`);
 
   stub("gawk bison");
   env_include("gnu.org/gcc");
 
+  const kernel_headers = Path.cwd().join(`kernel-5.4`);
+  await tmp(async () => {
+    await unarchive(`https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz`);
+    run`make INSTALL_HDR_PATH=${kernel_headers}`;
+  });
+
   Path.cwd().join("build").mkdir().cd();
 
   run`../configure
         --prefix=${prefix}
         --disable-debug
-      # --enable-kernel=2.6.0
+        --enable-kernel=5.4  # LTS 2029
         --disable-dependency-tracking
         --disable-silent-rules
         --disable-werror
-        --enable-obsolete-rpc
         --without-gd
         --without-selinux
-        --enable-multi-arch  # makes our glibc work on more intel archs
-       "--with-pkgversion=pkgx glibc-${version}"
+        --with-pkgversion="pkgx glibc-${version}"
         --with-bugurl=https://github.com/pkgxdev/pantry/issues/new
-       "CFLAGS=-O2 -march=x86-64 -mtune=generic"
+        --with-headers=${kernel_headers}/include
+        CFLAGS="-O2 -march=x86-64 -mtune=generic"
         `;
-  run`make`;// --jobs ${navigator.hardwareConcurrency}`;
+  run`make --jobs ${navigator.hardwareConcurrency}`;
   // run`make check`;
   run`make install`;
 }

projects/gnu.org/glibc/test.ts

@@ -0,0 +1,3 @@
+export default async function() {
+  //TODO
+}