From 2aebf034be1866d85788bd8b4b852a7af7f41f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?= Date: Wed, 17 Jan 2024 23:19:15 +0100 Subject: [PATCH] More build stuff: * Update gperftools * Update skia * Update Ubuntu dockers Fixes build on systems without `python` available, we now use `python3`. Also fixes third-party build warning spam. More boring build stuff is still pending, but that's for another day (Happy, Happy, Joy, Joy :P ). --- .gitmodules | 2 +- CMakeLists.txt | 1 + src/engine/CMakeLists.txt | 2 +- src/engine/skia | 2 +- src/gperftools | 2 +- src/scripts/Dockerfile.jammy | 2 +- src/scripts/Dockerfile.mantic | 2 +- src/scripts/build_ci.sh | 1 + 8 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index fe08cc7f9..fc0c07e62 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ -[submodule "src/skia"] +[submodule "src/engine/skia"] path = src/engine/skia url = https://github.com/friction2d/skia [submodule "src/gperftools"] diff --git a/CMakeLists.txt b/CMakeLists.txt index 44253874a..57731cf46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,6 +53,7 @@ endif() add_subdirectory(src/engine) if(UNIX) + option(BUILD_TESTING "Don't build gperftools tests" OFF) add_subdirectory(src/gperftools) endif() add_subdirectory(src/core) diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt index 083af3bbb..3239a1b83 100644 --- a/src/engine/CMakeLists.txt +++ b/src/engine/CMakeLists.txt @@ -52,7 +52,7 @@ else() set(SKIA_BUILD_CMD ninja -j${N}) set(SKIA_UPDATE_CMD true) set(SKIA_ARGS "ar=\"${CMAKE_AR}\" cc=\"${CMAKE_C_COMPILER}\" cxx=\"${CMAKE_CXX_COMPILER}\"") - set(SKIA_ARGS "${SKIA_ARGS} extra_cflags=[\"-Wno-error\"]") + set(SKIA_ARGS "${SKIA_ARGS} extra_cflags=[\"-Wno-error\", \"-Wno-psabi\"]") endif() set(SKIA_ARGS "${SKIA_ARGS} is_official_build=true is_debug=false") diff --git a/src/engine/skia b/src/engine/skia index eb2d64c54..cad3f646c 160000 --- a/src/engine/skia +++ b/src/engine/skia @@ -1 +1 @@ -Subproject commit eb2d64c549ea52f9400721c579858c8810caa717 +Subproject commit cad3f646c1cc0f1a3279d1c5505b3a9b258b5b68 diff --git a/src/gperftools b/src/gperftools index 00c924553..b97c293c8 160000 --- a/src/gperftools +++ b/src/gperftools @@ -1 +1 @@ -Subproject commit 00c92455366c60d6f8ddceb0e846262e874b9ab4 +Subproject commit b97c293c812c7ec3cdeccd50a89769e746c01377 diff --git a/src/scripts/Dockerfile.jammy b/src/scripts/Dockerfile.jammy index f52145b36..0e092872a 100644 --- a/src/scripts/Dockerfile.jammy +++ b/src/scripts/Dockerfile.jammy @@ -3,7 +3,7 @@ FROM ubuntu:jammy ARG DEBIAN_FRONTEND=noninteractive RUN apt update -y RUN apt upgrade -y -RUN apt install -y curl build-essential file clang git cmake python3 python-is-python3 ninja-build libfontconfig1-dev libfreetype-dev libavcodec-dev libavformat-dev libavutil-dev libqscintilla2-qt5-dev libqt5opengl5-dev libqt5svg5-dev libswresample-dev libswscale-dev libunwind-dev libqt5multimedia5-plugins qtbase5-dev-tools qtbase5-dev qtdeclarative5-dev-tools qtdeclarative5-dev qtmultimedia5-dev qttools5-dev-tools libexpat1-dev libfreetype-dev libjpeg-turbo8-dev libpng-dev libwebp-dev zlib1g-dev libicu-dev libharfbuzz-dev +RUN apt install -y curl build-essential file clang git cmake python3 ninja-build libfontconfig1-dev libfreetype-dev libavcodec-dev libavformat-dev libavutil-dev libqscintilla2-qt5-dev libqt5opengl5-dev libqt5svg5-dev libswresample-dev libswscale-dev libunwind-dev libqt5multimedia5-plugins qtbase5-dev-tools qtbase5-dev qtdeclarative5-dev-tools qtdeclarative5-dev qtmultimedia5-dev qttools5-dev-tools libexpat1-dev libfreetype-dev libjpeg-turbo8-dev libpng-dev libwebp-dev zlib1g-dev libicu-dev libharfbuzz-dev COPY build_docker.sh / CMD [ "bash", "./build_docker.sh" ] diff --git a/src/scripts/Dockerfile.mantic b/src/scripts/Dockerfile.mantic index aac0d1b90..c2eb7da2f 100644 --- a/src/scripts/Dockerfile.mantic +++ b/src/scripts/Dockerfile.mantic @@ -3,7 +3,7 @@ FROM ubuntu:mantic ARG DEBIAN_FRONTEND=noninteractive RUN apt update -y RUN apt upgrade -y -RUN apt install -y curl build-essential file clang git cmake python3 python-is-python3 ninja-build libfontconfig1-dev libfreetype-dev libavcodec-dev libavformat-dev libavutil-dev libqscintilla2-qt5-dev libqt5opengl5-dev libqt5svg5-dev libswresample-dev libswscale-dev libunwind-dev libqt5multimedia5-plugins qtbase5-dev-tools qtbase5-dev qtdeclarative5-dev-tools qtdeclarative5-dev qtmultimedia5-dev qttools5-dev-tools libglx-mesa0 libglx-dev libxcb-glx0-dev libexpat1-dev libfreetype-dev libjpeg-turbo8-dev libpng-dev libwebp-dev zlib1g-dev libicu-dev libharfbuzz-dev +RUN apt install -y curl build-essential file clang git cmake python3 ninja-build libfontconfig1-dev libfreetype-dev libavcodec-dev libavformat-dev libavutil-dev libqscintilla2-qt5-dev libqt5opengl5-dev libqt5svg5-dev libswresample-dev libswscale-dev libunwind-dev libqt5multimedia5-plugins qtbase5-dev-tools qtbase5-dev qtdeclarative5-dev-tools qtdeclarative5-dev qtmultimedia5-dev qttools5-dev-tools libglx-mesa0 libglx-dev libxcb-glx0-dev libexpat1-dev libfreetype-dev libjpeg-turbo8-dev libpng-dev libwebp-dev zlib1g-dev libicu-dev libharfbuzz-dev COPY build_docker.sh / CMD [ "bash", "./build_docker.sh" ] diff --git a/src/scripts/build_ci.sh b/src/scripts/build_ci.sh index cf6f131bc..e9adc8d78 100755 --- a/src/scripts/build_ci.sh +++ b/src/scripts/build_ci.sh @@ -34,6 +34,7 @@ git \ clang \ build-essential \ cmake \ +python3 \ ninja-build \ libfontconfig1-dev \ libfreetype-dev \