Skip to content

Commit 75992d8

Browse files
committed
wip
1 parent 2da0cd1 commit 75992d8

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

.github/Dockerfile

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ COPY ./deno.lock /work/deno.lock
1111
RUN cd /work && find ./brewkit -name \*.ts | xargs pkgx deno cache
1212
RUN pkgx deno cache /work/.github/scripts/generate-versions
1313

14-
RUN apt-get install libgcc-8-dev --yes
14+
# RUN apt-get install libgcc-8-dev --yes
1515

16-
RUN dpkg -L libgcc-8-dev | \
17-
while read -r file; do \
18-
case "$file" in \
19-
/usr/include/*|/usr/lib/*|/lib/*) [ -f "$file" ] && echo "$file" | tee;; \
20-
esac; \
21-
done > files.txt
16+
# RUN dpkg -L libgcc-8-dev | \
17+
# while read -r file; do \
18+
# case "$file" in \
19+
# /usr/include/*|/usr/lib/*|/lib/*) [ -f "$file" ] && echo "$file" | tee;; \
20+
# esac; \
21+
# done > files.txt
2222

2323
# we still need glibc for the pkgx ecosystem
2424
# linux headers are generally needed but we should provide
@@ -45,7 +45,7 @@ RUN dpkg -L libgcc-8-dev | \
4545
# RUN echo /lib/x86_64-linux-gnu/libtinfo.so.6.1 >> files.txt; \
4646
# echo /lib/x86_64-linux-gnu/libtinfo.so.6 >> files.txt
4747

48-
RUN tar czf /root/base.tgz -T files.txt
48+
# RUN tar czf /root/base.tgz -T files.txt
4949

5050

5151
#TODO we need a real bash for `ldd` which apparently is a bash script
@@ -57,13 +57,15 @@ FROM debian:buster-slim AS stage2
5757
COPY --from=stage1 /usr/local/bin/pkgx /usr/bin/pkgx
5858
COPY --from=stage1 /root/.pkgx /root/.pkgx
5959
COPY --from=stage1 /root/.cache/deno /root/.cache/deno
60-
COPY --from=stage1 /root/base.tgz /root/base.tgz
60+
# COPY --from=stage1 /root/base.tgz /root/base.tgz
6161

6262
RUN apt-get update && \
63-
apt-get install --yes libc6-dev linux-libc-dev libgcc-8-dev libgcc1 && \
64-
echo "Yes, do as I say!" | apt-get remove libstdc++6 libncursesw6 ncurses-base ncurses-bin
63+
apt-get install --yes libc6-dev linux-libc-dev libgcc-8-dev libgcc1
64+
65+
#&& \
66+
#echo "Yes, do as I say!" | apt-get remove libstdc++6 libncursesw6 ncurses-base ncurses-bin
6567

6668
# restore libgcc-8-dev
67-
RUN tar xzf /root/base.tgz -C / && rm /root/base.tgz
69+
# RUN tar xzf /root/base.tgz -C / && rm /root/base.tgz
6870

6971
ENV PKGX_DIST_URL="https://dist.pkgx.dev/v2"

projects/gnu.org/gcc/build.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default async function build({ prefix, version, deps }: BuildOptions) {
1515
// const old = Deno.env.get("PKGX_PANTRY_DIR");
1616
// Deno.env.delete("PKGX_DIST_URL");
1717
// Deno.env.delete("PKGX_PANTRY_DIR");
18-
// env_include("gnu.org/gcc^14");
18+
env_include("gnu.org/gcc^14");
1919
// Deno.env.set("LD_LIBRARY_PATH", [
2020
// deps['gnu.org/mpfr'].prefix.join("lib").string,
2121
// deps['gnu.org/mpc'].prefix.join("lib").string,

0 commit comments

Comments
 (0)