Skip to content

Commit 88fbd5a

Browse files
ReenigneArcherReenigneArcher
committed
build(docker): use cross compilation
1 parent 9970939 commit 88fbd5a

File tree

2 files changed

+113
-38
lines changed

2 files changed

+113
-38
lines changed

‎docker/debian-bookworm.dockerfile

+31-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
# syntax=docker/dockerfile:1
22
# artifacts: true
33
# platforms: linux/amd64,linux/arm64/v8
4-
# platforms_pr: linux/amd64
4+
# platforms_pr: linux/amd64,linux/arm64/v8
55
# no-cache-filters: sunshine-base,artifacts,sunshine
66
ARG BASE=debian
77
ARG TAG=bookworm
88
FROM ${BASE}:${TAG} AS sunshine-base
9-
109
ENV DEBIAN_FRONTEND=noninteractive
1110

12-
FROM sunshine-base AS sunshine-build
11+
ARG BASE
12+
ARG TAG
13+
FROM --platform=$BUILDPLATFORM ${BASE}:${TAG} AS sunshine-build
14+
ENV DEBIAN_FRONTEND=noninteractive
1315

16+
ARG TARGETPLATFORM
1417
ARG BRANCH
1518
ARG BUILD_VERSION
1619
ARG COMMIT
@@ -30,8 +33,33 @@ COPY --link .. .
3033
RUN <<_BUILD
3134
#!/bin/bash
3235
set -e
36+
37+
if [[ "${BUILDPLATFORM}" != "${TARGETPLATFORM}" ]]; then
38+
cross_compile="--cross-compile"
39+
else
40+
cross_compile=""
41+
fi
42+
43+
case "${TARGETPLATFORM}" in
44+
linux/amd64)
45+
cc_target_tuple="x86_64-linux-gnu"
46+
cc_target_arch="amd64"
47+
;;
48+
linux/arm64)
49+
cc_target_tuple="aarch64-linux-gnu"
50+
cc_target_arch="arm64"
51+
;;
52+
*)
53+
echo "unsupported platform: ${TARGETPLATFORM}";
54+
exit 1
55+
;;
56+
esac
57+
3358
chmod +x ./scripts/linux_build.sh
3459
./scripts/linux_build.sh \
60+
${cross_compile} \
61+
--cc-target-tuple="${cc_target_tuple}" \
62+
--cc-target-arch="${cc_target_arch}" \
3563
--publisher-name='LizardByte' \
3664
--publisher-website='https://app.lizardbyte.dev' \
3765
--publisher-issue-url='https://app.lizardbyte.dev/support' \

‎scripts/linux_build.sh

+82-35
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ set -e
33

44
# Default value for arguments
55
appimage_build=0
6+
cc_install_root="/mnt/cross"
7+
cc_target_tuple="$(uname -m)-linux-gnu"
8+
cc_target_arch="$(dpkg --print-architecture || rpm --eval '%{_host}')"
9+
cross_compile=0
610
num_processors=$(nproc)
711
publisher_name="Third Party Publisher"
812
publisher_website=""
@@ -28,6 +32,10 @@ Options:
2832
-h, --help Display this help message.
2933
-s, --sudo-off Disable sudo command.
3034
--appimage-build Compile for AppImage, this will not create the AppImage, just the executable.
35+
--cc-install-root The root directory to install the cross compiler. Default is /mnt/cross. (Fedora only)
36+
--cc-target-tuple The target tuple for the cross compiler.
37+
--cc-target-arch The target architecture for the cross compiler.
38+
--cross-compile Enable cross compilation.
3139
--num-processors The number of processors to use for compilation. Default is the value of 'nproc'.
3240
--publisher-name The name of the publisher (not developer) of the application.
3341
--publisher-website The URL of the publisher's website.
@@ -55,6 +63,16 @@ while getopts ":hs-:" opt; do
5563
appimage_build=1
5664
skip_libva=1
5765
;;
66+
cc-install-root=*)
67+
cc_install_root="${OPTARG#*=}"
68+
;;
69+
cc-target-tuple=*)
70+
cc_target_tuple="${OPTARG#*=}"
71+
;;
72+
cc-target-arch=*)
73+
cc_target_arch="${OPTARG#*=}"
74+
;;
75+
cross-compile) cross_compile=1 ;;
5876
num-processors=*)
5977
num_processors="${OPTARG#*=}"
6078
;;
@@ -97,28 +115,28 @@ function add_debain_based_deps() {
97115
"cmake"
98116
"doxygen"
99117
"flex" # required if we need to compile doxygen
100-
"gcc-${gcc_version}"
101-
"g++-${gcc_version}"
118+
"gcc-${gcc_version}:${cc_target_arch}"
119+
"g++-${gcc_version}:${cc_target_arch}"
102120
"git"
103121
"graphviz"
104-
"libcap-dev" # KMS
105-
"libcurl4-openssl-dev"
106-
"libdrm-dev" # KMS
107-
"libevdev-dev"
108-
"libminiupnpc-dev"
109-
"libnotify-dev"
110-
"libnuma-dev"
111-
"libopus-dev"
112-
"libpulse-dev"
113-
"libssl-dev"
114-
"libwayland-dev" # Wayland
115-
"libx11-dev" # X11
116-
"libxcb-shm0-dev" # X11
117-
"libxcb-xfixes0-dev" # X11
118-
"libxcb1-dev" # X11
119-
"libxfixes-dev" # X11
120-
"libxrandr-dev" # X11
121-
"libxtst-dev" # X11
122+
"libcap-dev:${cc_target_arch}" # KMS
123+
"libcurl4-openssl-dev:${cc_target_arch}"
124+
"libdrm-dev:${cc_target_arch}" # KMS
125+
"libevdev-dev:${cc_target_arch}"
126+
"libminiupnpc-dev:${cc_target_arch}"
127+
"libnotify-dev:${cc_target_arch}"
128+
"libnuma-dev:${cc_target_arch}"
129+
"libopus-dev:${cc_target_arch}"
130+
"libpulse-dev:${cc_target_arch}"
131+
"libssl-dev:${cc_target_arch}"
132+
"libwayland-dev:${cc_target_arch}" # Wayland
133+
"libx11-dev:${cc_target_arch}" # X11
134+
"libxcb-shm0-dev:${cc_target_arch}" # X11
135+
"libxcb-xfixes0-dev:${cc_target_arch}" # X11
136+
"libxcb1-dev:${cc_target_arch}" # X11
137+
"libxfixes-dev:${cc_target_arch}" # X11
138+
"libxrandr-dev:${cc_target_arch}" # X11
139+
"libxtst-dev:${cc_target_arch}" # X11
122140
"ninja-build"
123141
"npm" # web-ui
124142
"udev"
@@ -128,15 +146,21 @@ function add_debain_based_deps() {
128146

129147
if [ "$skip_libva" == 0 ]; then
130148
dependencies+=(
131-
"libva-dev" # VA-API
149+
"libva-dev:${cc_target_arch}" # VA-API
150+
)
151+
fi
152+
153+
if [ "$cross_compile" == 1 ]; then
154+
dependencies+=(
155+
"crossbuild-essential-${cc_target_arch}"
132156
)
133157
fi
134158
}
135159

136160
function add_debain_deps() {
137161
add_debain_based_deps
138162
dependencies+=(
139-
"libayatana-appindicator3-dev"
163+
"libayatana-appindicator3-dev:${cc_target_arch}"
140164
)
141165
}
142166

@@ -148,18 +172,27 @@ function add_ubuntu_deps() {
148172

149173
add_debain_based_deps
150174
dependencies+=(
151-
"libappindicator3-dev"
175+
"libappindicator3-dev:${cc_target_arch}"
152176
)
153177
}
154178

155179
function add_fedora_deps() {
156180
dependencies+=(
157181
"cmake"
158182
"doxygen"
159-
"gcc"
160-
"g++"
161183
"git"
162184
"graphviz"
185+
"ninja-build"
186+
"npm"
187+
"rpm-build" # if you want to build an RPM binary package
188+
"wget" # necessary for cuda install with `run` file
189+
"which" # necessary for cuda install with `run` file
190+
"xorg-x11-server-Xvfb" # necessary for headless unit testing
191+
)
192+
193+
arch_dependencies=(
194+
"gcc"
195+
"g++"
163196
"libappindicator-gtk3-devel"
164197
"libcap-devel"
165198
"libcurl-devel"
@@ -176,20 +209,14 @@ function add_fedora_deps() {
176209
"libXtst-devel" # X11
177210
"mesa-libGL-devel"
178211
"miniupnpc-devel"
179-
"ninja-build"
180-
"npm"
181212
"numactl-devel"
182213
"openssl-devel"
183214
"opus-devel"
184215
"pulseaudio-libs-devel"
185-
"rpm-build" # if you want to build an RPM binary package
186-
"wget" # necessary for cuda install with `run` file
187-
"which" # necessary for cuda install with `run` file
188-
"xorg-x11-server-Xvfb" # necessary for headless unit testing
189216
)
190217

191218
if [ "$skip_libva" == 0 ]; then
192-
dependencies+=(
219+
arch_dependencies+=(
193220
"libva-devel" # VA-API
194221
)
195222
fi
@@ -204,15 +231,15 @@ function install_cuda() {
204231

205232
local cuda_prefix="https://developer.download.nvidia.com/compute/cuda/"
206233
local cuda_suffix=""
207-
if [ "$architecture" == "aarch64" ]; then
234+
if [ "$cc_target_arch" == "aarch64" ]; then
208235
local cuda_suffix="_sbsa"
209236
fi
210237

211-
if [ "$architecture" == "aarch64" ]; then
238+
if [ "$cc_target_arch" == "aarch64" ]; then
212239
# we need to patch the math-vector.h file for aarch64 fedora
213240
# back up /usr/include/bits/math-vector.h
214241
math_vector_file=""
215-
if [ "$distro" == "ubuntu" ] || [ "$version" == "24.04" ]; then
242+
if [ "$distro" == "ubuntu" ] && [ "$version" == "24.04" ]; then
216243
math_vector_file="/usr/include/aarch64-linux-gnu/bits/math-vector.h"
217244
elif [ "$distro" == "fedora" ]; then
218245
math_vector_file="/usr/include/bits/math-vector.h"
@@ -283,6 +310,11 @@ function run_install() {
283310
"-DSUNSHINE_ENABLE_DRM=ON"
284311
)
285312

313+
if [ "$cross_compile" == 1 ]; then
314+
cmake_args+=("-DCMAKE_C_COMPILER=${cc_target_tuple}-gcc")
315+
cmake_args+=("-DCMAKE_CXX_COMPILER=${cc_target_tuple}-g++")
316+
fi
317+
286318
if [ "$appimage_build" == 1 ]; then
287319
cmake_args+=("-DSUNSHINE_BUILD_APPIMAGE=ON")
288320
fi
@@ -313,6 +345,11 @@ function run_install() {
313345
# Install the dependencies
314346
$package_install_command "${dependencies[@]}"
315347

348+
# Fedora has a special command for installing architecture specific packages
349+
if [ "$distro" == "fedora" ]; then
350+
$package_install_command_arch "${arch_dependencies[@]}"
351+
fi
352+
316353
# reload the environment
317354
# shellcheck source=/dev/null
318355
source ~/.bashrc
@@ -448,6 +485,11 @@ elif grep -q "PLATFORM_ID=\"platform:f39\"" /etc/os-release; then
448485
version="39"
449486
package_update_command="${sudo_cmd} dnf update -y"
450487
package_install_command="${sudo_cmd} dnf install -y"
488+
if [ "$cross_compile" == 0 ]; then
489+
package_install_command_arch="${sudo_cmd} dnf -y --releasever=39 --forcearch=${cc_target_arch} install"
490+
else
491+
package_install_command_arch="${sudo_cmd} dnf -y --installroot=${cc_install_root} --releasever=39 --forcearch=${cc_target_arch} install"
492+
fi
451493
cuda_version="12.4.0"
452494
cuda_build="550.54.14"
453495
gcc_version="13"
@@ -457,6 +499,11 @@ elif grep -q "PLATFORM_ID=\"platform:f40\"" /etc/os-release; then
457499
version="40"
458500
package_update_command="${sudo_cmd} dnf update -y"
459501
package_install_command="${sudo_cmd} dnf install -y"
502+
if [ "$cross_compile" == 0 ]; then
503+
package_install_command_arch="${sudo_cmd} dnf -y --releasever=39 --forcearch=${cc_target_arch} install"
504+
else
505+
package_install_command_arch="${sudo_cmd} dnf -y --installroot=${cc_install_root} --releasever=39 --forcearch=${cc_target_arch} install"
506+
fi
460507
cuda_version=
461508
cuda_build=
462509
gcc_version="13"

0 commit comments

Comments
 (0)