From f7be586a4ca4a15e3b4777f52a921c15d65845ec Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Tue, 23 Jan 2024 18:20:14 -0500 Subject: [PATCH] Build On Bullseye --- .gitea/workflows/build.yml | 12 +----------- CMakeLists.txt | 2 +- dependencies/glfw/src | 2 +- docs/INSTALL.md | 2 +- scripts/install-dependencies.sh | 20 +------------------- 5 files changed, 5 insertions(+), 33 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 72e00234e..9db86f530 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -23,18 +23,13 @@ jobs: - ARMHF name: Build runs-on: ubuntu-latest - container: node:16-buster + container: node:lts-bullseye steps: - name: Checkout Repository uses: actions/checkout@v4 with: submodules: true # Dependencies - - name: Install CMake - run: | - echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/backports.list - apt-get update - apt-get install --no-install-recommends -y -t buster-backports cmake - name: Install Dependencies run: ./scripts/install-dependencies.sh ${{ matrix.arch }} # Build @@ -62,11 +57,6 @@ jobs: with: submodules: true # Dependencies - - name: Install CMake - run: | - echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/backports.list - apt-get update - apt-get install --no-install-recommends -y -t buster-backports cmake - name: Install Dependencies run: ./scripts/install-dependencies.sh - name: Install ARM Toolchain diff --git a/CMakeLists.txt b/CMakeLists.txt index 705ca513d..350e8ecf8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,7 @@ add_compile_options(-ffast-math) # Warnings add_compile_options(-Wall -Wextra -Werror -Wpointer-arith -Wshadow -Wnull-dereference) -if(CMAKE_C_COMPILER_ID STREQUAL \"GNU\") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") # Prevents False Positives if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 10.0) add_compile_options(-Wno-stringop-overflow) diff --git a/dependencies/glfw/src b/dependencies/glfw/src index b4c3ef9d0..8e6c8d7ef 160000 --- a/dependencies/glfw/src +++ b/dependencies/glfw/src @@ -1 +1 @@ -Subproject commit b4c3ef9d0fdf46845f3e81e5d989dab06e71e6c1 +Subproject commit 8e6c8d7effc54f8aecd30eda17069588298f4ada diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 1c3689782..8d3ea5837 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -4,7 +4,7 @@ Download packages [here](https://gitea.thebrokenrail.com/minecraft-pi-reborn/minecraft-pi-reborn/releases). ### System Requirements -* Debian Buster/Ubuntu 18.04 Or Higher +* Debian Bullseye/Ubuntu 20.04 Or Higher * FUSE 2 * Debian/Ubuntu: ``sudo apt install libfuse2`` * Arch: ``sudo pacman -S fuse2`` diff --git a/scripts/install-dependencies.sh b/scripts/install-dependencies.sh index 088d2b54f..e40a9a493 100755 --- a/scripts/install-dependencies.sh +++ b/scripts/install-dependencies.sh @@ -20,9 +20,6 @@ run() { sudo apt-get update sudo apt-get dist-upgrade -y - # Architecture Detection - sudo apt-get install --no-install-recommends -y dpkg-dev - # Install Everything In One Go PKG_QUEUE='' queue_pkg() { @@ -44,22 +41,7 @@ run() { # Architecture-Specific Dependencies architecture_specific_pkg() { # Compiler - if [ "$(dpkg-architecture -qDEB_BUILD_ARCH)" = "$1" ]; then - queue_pkg \ - gcc \ - g++ - else - case "$1" in - 'armhf') GCC_TARGET='arm-linux-gnueabihf';; - 'arm64') GCC_TARGET='aarch64-linux-gnu';; - 'i386') GCC_TARGET='i686-linux-gnu';; - 'amd64') GCC_TARGET='x86-64-linux-gnu';; - esac - queue_pkg \ - "gcc-${GCC_TARGET}" \ - libc6-dev-$1-cross \ - "g++-${GCC_TARGET}" - fi + queue_pkg crossbuild-essential-$1 # Dependencies queue_pkg \