The open source OpenXR runtime
ci: Minor cleanup to install-cross.sh
+19
-19
+19
-19
.gitlab-ci/install-cross.sh
+19
-19
.gitlab-ci/install-cross.sh
···
1
1
#!/bin/bash
2
2
# Copyright 2019-2020, Mesa contributors
3
-
# Copyright 2020, Collabora, Ltd.
3
+
# Copyright 2020-2024, Collabora, Ltd.
4
4
# SPDX-License-Identifier: MIT
5
5
6
-
# Based on https://gitlab.freedesktop.org/mesa/mesa/-/blob/master/.gitlab-ci/container/x86_build.sh
6
+
# Based on https://gitlab.freedesktop.org/mesa/mesa/-/blob/2e100bd69b67cbb70b8a8e813ed866618a2252ca/.gitlab-ci/container/cross_build.sh
7
7
8
8
set -e
9
9
set -o xtrace
···
21
21
# OpenCV and libuvc aren't on this list because
22
22
# they apparently can't be installed in both architectures at once
23
23
apt-get install -y --no-install-recommends --no-remove \
24
-
crossbuild-essential-${arch} \
25
-
libelf-dev:${arch} \
26
-
libegl1-mesa-dev:${arch} \
27
-
libgl1-mesa-dev:${arch} \
28
-
libglvnd-dev:${arch} \
29
-
libhidapi-dev:${arch} \
30
-
libudev-dev:${arch} \
31
-
libusb-1.0-0-dev:${arch} \
32
-
libv4l-dev:${arch} \
33
-
libvulkan-dev:${arch} \
34
-
libwayland-dev:${arch} \
35
-
libx11-dev:${arch} \
36
-
libxcb-randr0-dev:${arch} \
37
-
libxrandr-dev:${arch} \
38
-
libxxf86vm-dev:${arch}
24
+
"crossbuild-essential-${arch}" \
25
+
"libelf-dev:${arch}" \
26
+
"libegl1-mesa-dev:${arch}" \
27
+
"libgl1-mesa-dev:${arch}" \
28
+
"libglvnd-dev:${arch}" \
29
+
"libhidapi-dev:${arch}" \
30
+
"libudev-dev:${arch}" \
31
+
"libusb-1.0-0-dev:${arch}" \
32
+
"libv4l-dev:${arch}" \
33
+
"libvulkan-dev:${arch}" \
34
+
"libwayland-dev:${arch}" \
35
+
"libx11-dev:${arch}" \
36
+
"libxcb-randr0-dev:${arch}" \
37
+
"libxrandr-dev:${arch}" \
38
+
"libxxf86vm-dev:${arch}"
39
39
40
40
if [ "$arch" != "i386" ]; then
41
-
mkdir /var/cache/apt/archives/${arch}
41
+
mkdir "/var/cache/apt/archives/${arch}"
42
42
apt-get install -y --no-remove \
43
-
libstdc++6:${arch}
43
+
"libstdc++6:${arch}"
44
44
fi
45
45
done
46
46