Skip to content

Commit 369b953

Browse files
authored
Merge pull request #1299 from starypatyk/docker-remove-mips
Docker cross compile - remove MIPS target platform
2 parents 6fb3572 + 4f8a84e commit 369b953

2 files changed

Lines changed: 4 additions & 9 deletions

File tree

contrib/Dockerfile

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Build the docker image from the root of the project with the following command :
33
# $ docker build -t librespot-cross -f contrib/Dockerfile .
44
#
5-
# The resulting image can be used to build librespot for linux x86_64, armhf, armel, mipsel, aarch64
5+
# The resulting image can be used to build librespot for linux x86_64, armhf, armel, aarch64
66
# $ docker run -v /tmp/librespot-build:/build librespot-cross
77
#
88
# The compiled binaries will be located in /tmp/librespot-build
@@ -22,33 +22,29 @@ RUN echo "deb http://archive.debian.org/debian-security stretch/updates main" >>
2222
RUN dpkg --add-architecture arm64
2323
RUN dpkg --add-architecture armhf
2424
RUN dpkg --add-architecture armel
25-
RUN dpkg --add-architecture mipsel
2625
RUN apt-get update
2726

28-
RUN apt-get install -y curl git build-essential crossbuild-essential-arm64 crossbuild-essential-armel crossbuild-essential-armhf crossbuild-essential-mipsel pkg-config
29-
RUN apt-get install -y libasound2-dev libasound2-dev:arm64 libasound2-dev:armel libasound2-dev:armhf libasound2-dev:mipsel
27+
RUN apt-get install -y curl git build-essential crossbuild-essential-arm64 crossbuild-essential-armel crossbuild-essential-armhf pkg-config
28+
RUN apt-get install -y libasound2-dev libasound2-dev:arm64 libasound2-dev:armel libasound2-dev:armhf
3029
RUN apt-get install -y libpulse0 libpulse0:arm64 libpulse0:armel libpulse0:armhf
3130

3231
RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.73 -y
3332
ENV PATH="/root/.cargo/bin/:${PATH}"
3433
RUN rustup target add aarch64-unknown-linux-gnu
3534
RUN rustup target add arm-unknown-linux-gnueabi
3635
RUN rustup target add arm-unknown-linux-gnueabihf
37-
RUN rustup target add mipsel-unknown-linux-gnu
3836

3937
RUN mkdir /.cargo && \
4038
echo '[target.aarch64-unknown-linux-gnu]\nlinker = "aarch64-linux-gnu-gcc"' > /.cargo/config && \
4139
echo '[target.arm-unknown-linux-gnueabihf]\nlinker = "arm-linux-gnueabihf-gcc"' >> /.cargo/config && \
42-
echo '[target.arm-unknown-linux-gnueabi]\nlinker = "arm-linux-gnueabi-gcc"' >> /.cargo/config && \
43-
echo '[target.mipsel-unknown-linux-gnu]\nlinker = "mipsel-linux-gnu-gcc"' >> /.cargo/config
40+
echo '[target.arm-unknown-linux-gnueabi]\nlinker = "arm-linux-gnueabi-gcc"' >> /.cargo/config
4441

4542
ENV CARGO_TARGET_DIR /build
4643
ENV CARGO_HOME /build/cache
4744
ENV PKG_CONFIG_ALLOW_CROSS=1
4845
ENV PKG_CONFIG_PATH_aarch64-unknown-linux-gnu=/usr/lib/aarch64-linux-gnu/pkgconfig/
4946
ENV PKG_CONFIG_PATH_arm-unknown-linux-gnueabihf=/usr/lib/arm-linux-gnueabihf/pkgconfig/
5047
ENV PKG_CONFIG_PATH_arm-unknown-linux-gnueabi=/usr/lib/arm-linux-gnueabi/pkgconfig/
51-
ENV PKG_CONFIG_PATH_mipsel-unknown-linux-gnu=/usr/lib/mipsel-linux-gnu/pkgconfig/
5248

5349
ADD . /src
5450
WORKDIR /src

contrib/docker-build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ cargo build --release --no-default-features --features alsa-backend
55
cargo build --release --target aarch64-unknown-linux-gnu --no-default-features --features alsa-backend
66
cargo build --release --target arm-unknown-linux-gnueabihf --no-default-features --features alsa-backend
77
cargo build --release --target arm-unknown-linux-gnueabi --no-default-features --features alsa-backend
8-
cargo build --release --target mipsel-unknown-linux-gnu --no-default-features --features alsa-backend

0 commit comments

Comments
 (0)