Updated stuff trying to get requirements for 32bit working for arm, etc.

blazium-engine · Oct 23, 2024 · 59f3dcc · 59f3dcc
1 parent 1882f15
commit 59f3dcc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/.github/workflows/linux-build.yaml b/.github/workflows/linux-build.yaml
@@ -17,7 +17,6 @@ env:
   GODOT_SDK_LINUX_ARM64: /root/aarch64-godot-linux-gnu_sdk-buildroot
   GODOT_SDK_LINUX_ARM32: /root/arm-godot-linux-gnueabihf_sdk-buildroot
   SCONSFLAGS: verbose=yes warnings=no progress=no
-  BASE_PATH: $PATH
   TERM: xterm
   PLATFORM: linuxbsd
   MONO: ${{ inputs.MONO }}

diff --git a/.github/workflows/monoglue.yaml b/.github/workflows/monoglue.yaml
@@ -12,7 +12,6 @@ env:
   GODOT_SDK_LINUX_ARM32: /root/arm-godot-linux-gnueabihf_sdk-buildroot
   SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes
   SCONS_CACHE_MSVC_CONFIG: true
-  BASE_PATH: $PATH
 
 jobs:
   build-glue:
@@ -28,7 +27,7 @@ jobs:
           repository: blazium-engine/blazium
           ref: ${{ github.event.client_payload.branch }}
           fetch-depth: 1
-          
+
       - name: Get BASE_PATH
         id: pathing
         run: |

diff --git a/images/linux.Dockerfile b/images/linux.Dockerfile
@@ -13,7 +13,7 @@ RUN dnf update -y
 RUN dnf install -y --setopt=install_weak_deps=False \
     bash bzip2 curl file findutils gettext \
     git make nano patch pkg-config unzip xz gcc-c++ cmake gdb \
-    glibc-devel glibc-devel.i686 libcxx-devel libcxx
+    glibc-devel glibc-devel.i686 libcxx-devel libcxx libstdc++-devel libstdc++.x86_64 libstdc++.i686
 
 # Install Python and pip for SCons
 RUN dnf install -y python3-pip