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 ).
friction2d · Jan 17, 2024 · 2aebf03 · 2aebf03
1 parent 5a5f7b8
commit 2aebf03
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/src/gperftools b/src/gperftools
diff --git 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
@@ -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
@@ -34,6 +34,7 @@ git \
 clang \
 build-essential \
 cmake \
+python3 \
 ninja-build \
 libfontconfig1-dev \
 libfreetype-dev \
+2 −0		.gn
+1 −1		bin/fetch-gn
+1 −1		gn/cp.py
+1 −1		gn/find_headers.py
+1 −1		gn/find_msvc.py
+1 −1		gn/find_xcode_sysroot.py
+1 −1		gn/is_clang.py
+1 −1		gn/toolchain/num_cpus.py