Remove libxcb and libwayland dependencies from config

See https://github.com/wasmerio/wasmer/issues/2822
For some reason these libraries get linked into the final
release binary, which should not be the default (since
these dependencies are only needed for the experimental-io
extension).
This commit is contained in:
Felix Schütt
2022-06-20 14:29:55 +02:00
parent a3daf3d113
commit be322f8fba
5 changed files with 3 additions and 22 deletions

View File

@@ -8,5 +8,4 @@ RUN cargo install cross
RUN dpkg --add-architecture arm64 && \
apt-get update && \
apt-get install -qy curl && \
curl -sSL https://get.docker.com/ | sh && \
apt-get install --assume-yes libxkbcommon0:arm64 libwayland-cursor0:arm64 libxkbcommon-dev:arm64 libwayland-dev:arm64 libxkbcommon-x11-dev:arm64
curl -sSL https://get.docker.com/ | sh

View File

@@ -87,15 +87,10 @@ jobs:
sudo apt-get update -y
sudo apt-get install -y --allow-downgrades libstdc++6=8.4.0-1ubuntu1~18.04
sudo apt-get install --reinstall g++-8
- name: Install dependencies on Linux
if: matrix.build == 'linux-x64'
run: |
sudo apt-get update -y
sudo apt-get install -y libwayland-cursor0 libxkbcommon-dev libwayland-dev
- name: Set up base deps on musl
if: matrix.build == 'linux-musl-x64'
run: |
apk add build-base bash musl-dev curl make libtool libffi-dev gcc automake autoconf git openssl-dev g++ libxkbcommon-dev wayland-dev
apk add build-base bash musl-dev curl make libtool libffi-dev gcc automake autoconf git openssl-dev g++
- name: Install Rust
uses: actions-rs/toolchain@v1
with:

View File

@@ -13,10 +13,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up dependencies
run: |
sudo apt-get update -y
sudo apt-get install -y libxkbcommon-dev
- name: Install Rust
uses: actions-rs/toolchain@v1
with:

View File

@@ -28,10 +28,6 @@ jobs:
tar xf /opt/llvm.tar.xz --strip-components=1 -C /opt/llvm-12
echo '/opt/llvm-12/bin' >> $GITHUB_PATH
echo 'LLVM_SYS_120_PREFIX=/opt/llvm-12' >> $GITHUB_ENV
- name: Install dependencies on Linux
run: |
sudo apt-get update -y
sudo apt-get install -y libwayland-cursor0 libxkbcommon-dev libwayland-dev
- run: make lint
env:
ENABLE_CRANELIFT: "1"

View File

@@ -98,15 +98,10 @@ jobs:
sudo apt-get update -y
sudo apt-get install -y --allow-downgrades libstdc++6=8.4.0-1ubuntu1~18.04
sudo apt-get install --reinstall g++-8
- name: Install dependencies on Linux
if: matrix.build == 'linux-x64'
run: |
sudo apt-get update -y
sudo apt-get install -y libwayland-cursor0 libxkbcommon-dev libwayland-dev
- name: Set up base deps on musl
if: matrix.build == 'linux-musl-x64'
run: |
apk add build-base bash musl-dev curl make libtool libffi-dev gcc automake autoconf git openssl-dev g++ libxkbcommon-dev wayland-dev
apk add build-base bash musl-dev curl make libtool libffi-dev gcc automake autoconf git openssl-dev g++
- name: Install Rust
uses: actions-rs/toolchain@v1
with: