mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-07-05 02:58:42 +08:00
Merge branch 'master' of https://gitlab.redox-os.org/redox-os/redox
This commit is contained in:
commit
d28097d754
@ -420,8 +420,6 @@ ubuntu()
|
|||||||
help2man \
|
help2man \
|
||||||
intltool \
|
intltool \
|
||||||
libc6-dev-i386 \
|
libc6-dev-i386 \
|
||||||
libexpat-dev \
|
|
||||||
libfontconfig1-dev \
|
|
||||||
libfuse3-dev \
|
libfuse3-dev \
|
||||||
libgdk-pixbuf2.0-bin \
|
libgdk-pixbuf2.0-bin \
|
||||||
libglib2.0-dev-bin \
|
libglib2.0-dev-bin \
|
||||||
@ -430,7 +428,6 @@ ubuntu()
|
|||||||
libjpeg-dev \
|
libjpeg-dev \
|
||||||
libmpfr-dev \
|
libmpfr-dev \
|
||||||
libparse-yapp-perl \
|
libparse-yapp-perl \
|
||||||
libpng-dev \
|
|
||||||
libsdl1.2-dev \
|
libsdl1.2-dev \
|
||||||
libsdl2-ttf-dev \
|
libsdl2-ttf-dev \
|
||||||
llvm \
|
llvm \
|
||||||
@ -466,7 +463,6 @@ ubuntu()
|
|||||||
xutils-dev \
|
xutils-dev \
|
||||||
xxd \
|
xxd \
|
||||||
zip \
|
zip \
|
||||||
zlib1g-dev \
|
|
||||||
zstd"
|
zstd"
|
||||||
# Not availible for at least ARM hosts
|
# Not availible for at least ARM hosts
|
||||||
case "$host_arch" in
|
case "$host_arch" in
|
||||||
|
|||||||
@ -35,15 +35,12 @@ RUN apt-get update \
|
|||||||
itstool \
|
itstool \
|
||||||
libaudiofile-dev \
|
libaudiofile-dev \
|
||||||
libdbus-glib-1-dev-bin \
|
libdbus-glib-1-dev-bin \
|
||||||
libexpat-dev \
|
|
||||||
libfontconfig1-dev \
|
|
||||||
libfuse3-dev \
|
libfuse3-dev \
|
||||||
libgdk-pixbuf2.0-bin \
|
libgdk-pixbuf2.0-bin \
|
||||||
libglib2.0-dev-bin \
|
libglib2.0-dev-bin \
|
||||||
libhtml-parser-perl \
|
libhtml-parser-perl \
|
||||||
libjpeg-dev \
|
libjpeg-dev \
|
||||||
libparse-yapp-perl \
|
libparse-yapp-perl \
|
||||||
libpng-dev \
|
|
||||||
librsvg2-common \
|
librsvg2-common \
|
||||||
libsdl1.2-dev \
|
libsdl1.2-dev \
|
||||||
libsdl2-ttf-dev \
|
libsdl2-ttf-dev \
|
||||||
@ -82,7 +79,6 @@ RUN apt-get update \
|
|||||||
xutils-dev \
|
xutils-dev \
|
||||||
xxd \
|
xxd \
|
||||||
zip \
|
zip \
|
||||||
zlib1g-dev \
|
|
||||||
zstd \
|
zstd \
|
||||||
&& if [ "$(uname -m)" = "x86_64" ]; then \
|
&& if [ "$(uname -m)" = "x86_64" ]; then \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user