diff options
| -rw-r--r-- | Dockerfile | 11 | ||||
| -rw-r--r-- | Makefile | 38 |
2 files changed, 8 insertions, 41 deletions
diff --git a/Dockerfile b/Dockerfile index aaefb680e..23928bb1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,7 @@ WORKDIR /home/ubuntu ARG BUILDARCH ENV ARCH "$BUILDARCH" -ENV JSC_BASE_DIR /home/ubuntu/bun-webkit-linux-$ARCH + RUN npm install -g esbuild RUN wget https://github.com/Jarred-Sumner/zig/releases/download/dec20/zig-linux-$ARCH.zip; \ @@ -55,10 +55,12 @@ RUN wget https://github.com/Jarred-Sumner/zig/releases/download/dec20/zig-linux- rm zig-linux-$ARCH.zip; +ENV WEBKIT_OUT_DIR /home/ubuntu/bun-webkit + WORKDIR /home/ubuntu RUN wget https://github.com/Jarred-Sumner/WebKit/releases/download/Bun-v0/bun-webkit-linux-$ARCH.tar.gz; \ tar -xzvf bun-webkit-linux-$ARCH.tar.gz; \ - rm bun-webkit-linux-$ARCH.tar.gz + rm bun-webkit-linux-$ARCH.tar.gz && cat $WEBKIT_OUT_DIR/include/cmakeconfig.h > /dev/null @@ -82,12 +84,11 @@ RUN wget https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c cp lib/libicutu.a /home/ubuntu/bun/src/deps && \ cp lib/libicuuc.a /home/ubuntu/bun/src/deps - +ENV PATH "/home/ubuntu/zig:$PATH" +ENV JSC_BASE_DIR $WEBKIT_OUT_DIR WORKDIR /home/ubuntu/bun - -ENV PATH "/home/ubuntu/zig:$PATH" RUN make api analytics node-fallbacks runtime_js fallback_decoder bun_error mimalloc picohttp zlib libarchive boringssl picohttp WORKDIR /home/ubuntu/bun @@ -398,39 +398,7 @@ httpbench-release: bun-codesign-debug: bun-codesign-release-local: -remove-glibc-version-dependency: - patchelf --clear-symbol-version __libc_start_main $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_key_create $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_once $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_setspecific $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_getspecific $(RELEASE_BUN); - patchelf --clear-symbol-version dlclose $(RELEASE_BUN); - patchelf --clear-symbol-version dlopen $(RELEASE_BUN); - patchelf --clear-symbol-version dlsym $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_attr_getstack $(RELEASE_BUN); - patchelf --clear-symbol-version dladdr $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_attr_setstacksize $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_create $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_detach $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_join $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_kill $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_mutex_trylock $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_setname_np $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_attr_setguardsize $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_rwlock_destroy $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_rwlock_rdlock $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_rwlock_init $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_rwlock_unlock $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_rwlock_wrlock $(RELEASE_BUN); - patchelf --clear-symbol-version __pthread_key_create $(RELEASE_BUN); - patchelf --clear-symbol-version fstat $(RELEASE_BUN); - patchelf --clear-symbol-version fstat64 $(RELEASE_BUN); - patchelf --clear-symbol-version lstat $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_getattr_np $(RELEASE_BUN); - patchelf --clear-symbol-version stat $(RELEASE_BUN); - patchelf --clear-symbol-version lstat64 $(RELEASE_BUN); - patchelf --clear-symbol-version pthread_sigmask $(RELEASE_BUN); - patchelf --clear-symbol-version __libc_single_threaded $(RELEASE_BUN); + check-glibc-version-dependency: @objdump -T $(RELEASE_BUN) | ((grep -qe "GLIBC_2.3[0-9]") && { echo "Glibc 2.3X detected, this will break the binary"; exit 1; }) || true @@ -544,17 +512,15 @@ release-bin-check-version: test $(shell eval $(BUN_RELEASE_BIN) --version) = $(PACKAGE_JSON_VERSION) release-bin-check: release-bin-check-version -release-bin-patch: ifeq ($(OS_NAME),linux) -release-bin-patch: remove-glibc-version-dependency release-bin-check: release-bin-check-version # force it to run @make -B check-glibc-version-dependency endif -release-bin-without-push: release-bin-patch test-all release-bin-check release-bin-generate release-bin-codesign +release-bin-without-push: test-all release-bin-check release-bin-generate release-bin-codesign release-bin: release-bin-without-push release-bin-push |