haiwan
/
sledge
0
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #174 from gwsystems/remove-libuv-zombies

Browse Source 
chore: remove libuv
main
Sean McBride 4 years ago committed by GitHub
parent af02e8dfc7 0bd5b5782f
commit 5d64091e56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 74 additions and 79 deletions
Show Stats Download Patch File Download Diff File

74
Dockerfile.aarch64
Unescape View File

@ -4,42 +4,41 @@
FROM ubuntu:bionic FROM ubuntu:bionic
# install some basic packages # install some basic packages
RUN apt-get update \ RUN apt-get update
&& apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
build-essential \ build-essential \
curl \ curl \
git \ git \
python3-dev \ python3-dev \
python3-pip \ python3-pip \
cmake \ cmake \
ca-certificates \ ca-certificates \
libssl-dev \ libssl-dev \
pkg-config \ pkg-config \
gcc \ gcc \
g++ \ g++ \
clang-8 \ clang-8 \
clang-tools-8 \ clang-tools-8 \
llvm-8 \ llvm-8 \
llvm-8-dev \ llvm-8-dev \
libc++-dev \ libc++-dev \
libc++abi-dev \ libc++abi-dev \
lld-8 \ lld-8 \
lldb-8 \ lldb-8 \
libclang-8-dev \ libclang-8-dev \
libclang-common-8-dev \ libclang-common-8-dev \
vim \ vim \
apache2 \ apache2 \
subversion \ subversion \
libapache2-mod-svn \ libapache2-mod-svn \
libsvn-dev \ libsvn-dev \
binutils-dev \ binutils-dev \
build-essential \ build-essential \
automake \ automake \
libtool \ libtool \
strace \ strace \
less \ less
libuv1-dev \ RUN rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/*
# set to use our installed clang version # set to use our installed clang version
RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 100 RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 100
@ -48,8 +47,7 @@ RUN update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm
# set LD_LIBRARY_PATH # set LD_LIBRARY_PATH
ENV LD_LIBRARY_PATH=/usr/local/lib ENV LD_LIBRARY_PATH=/usr/local/lib
RUN curl https://sh.rustup.rs -sSf | \ RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y
sh -s -- --default-toolchain stable -y
ENV PATH=/root/.cargo/bin:$PATH ENV PATH=/root/.cargo/bin:$PATH
RUN rustup component add rustfmt RUN rustup component add rustfmt

77
Dockerfile.x86_64
Unescape View File

@ -4,42 +4,41 @@
FROM ubuntu:bionic FROM ubuntu:bionic
# install some basic packages # install some basic packages
RUN apt-get update \ RUN apt-get update
&& apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
build-essential \ build-essential \
curl \ curl \
git \ git \
python3-dev \ python3-dev \
python3-pip \ python3-pip \
cmake \ cmake \
ca-certificates \ ca-certificates \
libssl-dev \ libssl-dev \
pkg-config \ pkg-config \
gcc \ gcc \
g++ \ g++ \
clang-8 \ clang-8 \
clang-tools-8 \ clang-tools-8 \
llvm-8 \ llvm-8 \
llvm-8-dev \ llvm-8-dev \
libc++-dev \ libc++-dev \
libc++abi-dev \ libc++abi-dev \
lld-8 \ lld-8 \
lldb-8 \ lldb-8 \
libclang-8-dev \ libclang-8-dev \
libclang-common-8-dev \ libclang-common-8-dev \
vim \ vim \
apache2 \ apache2 \
subversion \ subversion \
libapache2-mod-svn \ libapache2-mod-svn \
libsvn-dev \ libsvn-dev \
binutils-dev \ binutils-dev \
build-essential \ build-essential \
automake \ automake \
libtool \ libtool \
strace \ strace \
less \ less
libuv1-dev \ RUN rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/*
# set to use our installed clang version # set to use our installed clang version
RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 100 RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 100
@ -48,8 +47,7 @@ RUN update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm
# set LD_LIBRARY_PATH # set LD_LIBRARY_PATH
ENV LD_LIBRARY_PATH=/usr/local/lib ENV LD_LIBRARY_PATH=/usr/local/lib
RUN curl https://sh.rustup.rs -sSf | \ RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y
sh -s -- --default-toolchain stable -y
ENV PATH=/root/.cargo/bin:$PATH ENV PATH=/root/.cargo/bin:$PATH
RUN rustup component add rustfmt RUN rustup component add rustfmt
@ -57,8 +55,7 @@ RUN rustup target add wasm32-wasi
RUN cargo install --debug cargo-audit cargo-watch rsign2 RUN cargo install --debug cargo-audit cargo-watch rsign2
RUN curl -sS -L -O https://github.com/CraneStation/wasi-sdk/releases/download/wasi-sdk-7/wasi-sdk_7.0_amd64.deb \ RUN curl -sS -L -O https://github.com/CraneStation/wasi-sdk/releases/download/wasi-sdk-7/wasi-sdk_7.0_amd64.deb && dpkg -i wasi-sdk_7.0_amd64.deb && rm -f wasi-sdk_7.0_amd64.deb
&& dpkg -i wasi-sdk_7.0_amd64.deb && rm -f wasi-sdk_7.0_amd64.deb
ENV WASI_SDK=/opt/wasi-sdk ENV WASI_SDK=/opt/wasi-sdk
ENV PATH=/opt/sledge/bin:$PATH ENV PATH=/opt/sledge/bin:$PATH

2
runtime/Makefile
Unescape View File

@ -89,7 +89,7 @@ all: clean runtime
runtime: runtime:
@echo "Compiling runtime" @echo "Compiling runtime"
@mkdir -p bin/ @mkdir -p bin/
@${CC} ${CC_OPTIONS} ${INCLUDES} ${CFLAGS} ${LDFLAGS} ${CFILES} ${JSMNCFLAGS} -L/usr/lib/ -luv $^ -o bin/${BINARY_NAME} @${CC} ${CC_OPTIONS} ${INCLUDES} ${CFLAGS} ${LDFLAGS} ${CFILES} ${JSMNCFLAGS} -L/usr/lib/ $^ -o bin/${BINARY_NAME}
thirdparty: thirdparty:
@echo "Compiling thirdparty" @echo "Compiling thirdparty"

Write Preview
Loading…
Cancel
Save