From 342dd18d82edb5f327a9258035189d2aa63ee97b Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Tue, 4 Oct 2022 03:52:16 -0700 Subject: [PATCH] cosmo: include cosmopolitan linenoise --- cosmo/Dockerfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cosmo/Dockerfile b/cosmo/Dockerfile index 6cbc64e..3c4d070 100644 --- a/cosmo/Dockerfile +++ b/cosmo/Dockerfile @@ -29,10 +29,15 @@ RUN : \ # fix execution on alpine (although installing the loader mitigates this) \ && sed -i 's/skip=" 76" count=" 128"/skip=76 count=128 /' build/bootstrap/*.com \ && install -m0755 build/bootstrap/ape.elf /usr/bin/ape \ + && shed Makefile \ +# TODO: apply changes to COSMOPOLITAN_HEADERS as to include them in cosmopolitan.h \ +# NOTE: the order here is important! look at the generated o/depend file for hints. \ +# include cosmopolitan linenoise (formerly known as bestline) \ +'/\bNET_HTTP\b/i\\tTHIRD_PARTY_LINENOISE\t\t\\' \ # include LoadZipArgs in cosmopolitan.a \ - && shed Makefile '/COSMOPOLITAN_OBJECTS =/a\\tTOOL_ARGS\t\t\\' \ +'/\bNET_HTTP\b/i\\tTOOL_ARGS\t\t\\' \ # include nsync_cv_signal and nsync_cv_wait_with_deadline in cosmopolitan.a \ - && shed Makefile '/THIRD_PARTY_NSYNC_MALLOC/i\\tTHIRD_PARTY_NSYNC_MEM\t\t\\' \ +'/\bTHIRD_PARTY_NSYNC_MALLOC\b/i\\tTHIRD_PARTY_NSYNC_MEM\t\t\\' \ # add missing include \ && shed libc/isystem/utime.h '/"libc\/time\/time.h"/i\#include "libc/time/struct/utimbuf.h"' \ # awk's pledge isn't working for me for whatever reason \ @@ -118,6 +123,7 @@ RUN . ./env \ "libc/integral" \ "third_party/gdtoa/gdtoa.h" \ "third_party/getopt/getopt.h" \ + "third_party/linenoise/linenoise.h" \ "third_party/musl/crypt.h" \ "third_party/musl/fnmatch.h" \ "third_party/musl/passwd.h" \