From 822ca6405fed34554f48e320ee6c6d35402acd06 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Fri, 2 Oct 2026 18:20:48 -0400 Subject: [PATCH] build: the i386 preloads at the very end of the preload step The step also builds libtracefs with the aarch64 cross compiler after the first move; gcc-multilib must come after all of them. --- .github/workflows/build.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94b4229761..8470cb6180 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -190,15 +190,6 @@ jobs: aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ -o "$D/libblfastpath.so" tools/proot/fastpath/fastpath.c -ldl aarch64-linux-gnu-strip --strip-unneeded "$D/libblfastpath.so" - # And for 32-bit x86 programs (Left 4 Dead 2 and the other Source games are i386). Last: - # gcc-multilib conflicts with the aarch64 cross compiler and removes it. - sudo apt-get install -y -qq gcc-multilib g++-multilib >/dev/null - gcc -m32 -shared -fPIC -O2 -Wall -pthread \ - -o "$D/libblsession-i386.so" tools/linuxfs/preload/*.c -ldl - g++ -m32 -shared -fPIC -O2 -Wall -Wno-attributes -Wno-nonnull-compare \ - -pthread -std=c++17 -static-libstdc++ -static-libgcc -Wl,--exclude-libs,ALL \ - -o "$D/libfakeinput-i386.so" app/src/main/cpp/fakeinput_steam.cpp -ldl - strip --strip-unneeded "$D/libblsession-i386.so" "$D/libfakeinput-i386.so" for script in tools/linuxfs/overlay/usr/local/bin/bannerlator-*; do install -Dm644 "$script" "$D/usr/local/bin/$(basename "$script")" done @@ -249,7 +240,15 @@ jobs: install -Dm644 tools/linuxfs/desktop/panel.conf "$D/etc/xdg/lxqt/panel.conf" install -Dm644 tools/linuxfs/desktop/firefox-droiddeck.js "$D/usr/lib/firefox/defaults/pref/droiddeck.js" ls -lR "$D" - + # And for 32-bit x86 programs (Left 4 Dead 2 and the other Source games are i386). Last: + # gcc-multilib conflicts with the aarch64 cross compiler and removes it. + sudo apt-get install -y -qq gcc-multilib g++-multilib >/dev/null + gcc -m32 -shared -fPIC -O2 -Wall -pthread \ + -o "$D/libblsession-i386.so" tools/linuxfs/preload/*.c -ldl + g++ -m32 -shared -fPIC -O2 -Wall -Wno-attributes -Wno-nonnull-compare \ + -pthread -std=c++17 -static-libstdc++ -static-libgcc -Wl,--exclude-libs,ALL \ + -o "$D/libfakeinput-i386.so" app/src/main/cpp/fakeinput_steam.cpp -ldl + strip --strip-unneeded "$D/libblsession-i386.so" "$D/libfakeinput-i386.so" - name: Cache PulseAudio 13.0 source id: pa-src uses: actions/cache@v4