wip

Author: mxcl

.github/Dockerfile

@@ -11,14 +11,14 @@ COPY ./deno.lock /work/deno.lock
 RUN cd /work && find ./brewkit -name \*.ts | xargs pkgx deno cache
 RUN pkgx deno cache /work/.github/scripts/generate-versions
 
-RUN apt-get install libgcc-8-dev --yes
+# RUN apt-get install libgcc-8-dev --yes
 
-RUN dpkg -L libgcc-8-dev | \
-      while read -r file; do \
-        case "$file" in \
-        /usr/include/*|/usr/lib/*|/lib/*) [ -f "$file" ] && echo "$file" | tee;; \
-        esac; \
-      done > files.txt
+# RUN dpkg -L libgcc-8-dev | \
+#       while read -r file; do \
+#         case "$file" in \
+#         /usr/include/*|/usr/lib/*|/lib/*) [ -f "$file" ] && echo "$file" | tee;; \
+#         esac; \
+#       done > files.txt
 
 # we still need glibc for the pkgx ecosystem
 # linux headers are generally needed but we should provide
@@ -45,25 +45,28 @@ RUN dpkg -L libgcc-8-dev | \
 # RUN echo /lib/x86_64-linux-gnu/libtinfo.so.6.1 >> files.txt; \
 #     echo /lib/x86_64-linux-gnu/libtinfo.so.6 >> files.txt
 
-RUN tar czf /root/base.tgz -T files.txt
+# RUN tar czf /root/base.tgz -T files.txt
 
 
 #TODO we need a real bash for `ldd` which apparently is a bash script
 # symlinking /bin/sh doesn’t work
 
 
 # we want a tiny image with the right glibc, busybox works for now
-FROM debian:buster-slim AS stage2
+FROM debian:latest AS stage2
 COPY --from=stage1 /usr/local/bin/pkgx /usr/bin/pkgx
 COPY --from=stage1 /root/.pkgx /root/.pkgx
 COPY --from=stage1 /root/.cache/deno /root/.cache/deno
-COPY --from=stage1 /root/base.tgz /root/base.tgz
+# COPY --from=stage1 /root/base.tgz /root/base.tgz
 
 RUN apt-get update && \
-  apt-get install --yes libc6-dev linux-libc-dev libgcc-8-dev libgcc1 && \
-  echo "Yes, do as I say!" | apt-get remove libstdc++6 libncursesw6 ncurses-base ncurses-bin
+  apt-get install --yes libc6-dev linux-libc-dev libgcc-11-dev libgcc1 gcc g++
 
 # restore libgcc-8-dev
-RUN tar xzf /root/base.tgz -C / && rm /root/base.tgz
+# RUN tar xzf /root/base.tgz -C / && rm /root/base.tgz
 
 ENV PKGX_DIST_URL="https://dist.pkgx.dev/v2"
+
+# fix terminal arrow keys and backspace etc.
+# needed because we unintall curses or something above
+ENV TERM="linux"

bin/pkg-build

@@ -60,19 +60,19 @@ async function prep_toolchain(tmpdir: Path, srcroot: Path) {
     const llvm_bin = new Path(await backticks_quiet`pkgx -q +llvm.org -- which clang`).parent();
     const ln = (tool: string, llvm_tool: string) =>
       bin.join(tool).ln('s', { target: llvm_bin.join(llvm_tool) });
-    ln('cc', 'clang');
-    ln('gcc', 'clang');
-    ln('clang', 'clang');
-    ln('c++', 'clang++');
-    ln('g++', 'clang++');
-    ln('clang++', 'clang++');
-    ln('cpp', 'clang-cpp');
-    ln('ld', 'ld.lld');
-    ln('ar', 'llvm-ar');
-    ln('as', 'llvm-as');
-    ln('nm', 'llvm-nm');
-    ln('strings', 'llvm-strings');
-    ln('ranlib', 'llvm-ranlib');
+    // ln('cc', 'clang');
+    // ln('gcc', 'clang');
+    // ln('clang', 'clang');
+    // ln('c++', 'clang++');
+    // ln('g++', 'clang++');
+    // ln('clang++', 'clang++');
+    // ln('cpp', 'clang-cpp');
+    // ln('ld', 'ld.lld');
+    // ln('ar', 'llvm-ar');
+    // ln('as', 'llvm-as');
+    // ln('nm', 'llvm-nm');
+    // ln('strings', 'llvm-strings');
+    // ln('ranlib', 'llvm-ranlib');
 
     env["PATH"] = `${bin}:/usr/bin:/bin:/usr/sbin:/sbin`;
     // stops ./configure from erroring in our container

brewkit/run.ts

@@ -6,7 +6,7 @@ function run_f(args: string[]) {
 
   const pretty_args = args.map((arg) => {
     if (arg.includes(" ")) {
-      return arg.replace(/s+/, "\\ ");
+      return arg.replaceAll(/\s+/g, "\\ ");
     } else {
       return arg;
     }
@@ -87,7 +87,7 @@ function splitArgs(input: string): string[] {
   input = input.replace(/#.*$/gm, "");
 
   while ((match = regex.exec(input)) !== null) {
-    args.push(match[1] || match[2] || match[3]);
+    args.push((match[1] || match[2] || match[3]).trim());
   }
 
   return args;