[Bf-blender-cvs] [2761f7c4a5b] master: Build: fix MESA failing to build with missing EXPAT dependency

Campbell Barton noreply at git.blender.org
Tue Dec 13 02:36:24 CET 2022


Commit: 2761f7c4a5bda3111ca0948a8ffcb17802f88cbb
Author: Campbell Barton
Date:   Tue Dec 13 11:34:41 2022 +1100
Branches: master
https://developer.blender.org/rB2761f7c4a5bda3111ca0948a8ffcb17802f88cbb

Build: fix MESA failing to build with missing EXPAT dependency

===================================================================

M	build_files/build_environment/cmake/mesa.cmake

===================================================================

diff --git a/build_files/build_environment/cmake/mesa.cmake b/build_files/build_environment/cmake/mesa.cmake
index 8c7ec8fac07..ab07c09cc00 100644
--- a/build_files/build_environment/cmake/mesa.cmake
+++ b/build_files/build_environment/cmake/mesa.cmake
@@ -33,6 +33,8 @@ set(MESA_EXTRA_FLAGS
   # At some point we will likely want to support Wayland.
   # Disable for now since it's not officially supported.
   -Dplatforms=x11
+  # Needed to find the local expat.
+  --pkg-config-path=${LIBDIR}/expat/lib/pkgconfig
   --native-file ${BUILD_DIR}/mesa/tmp/native-file.ini
 )
 
@@ -53,6 +55,8 @@ add_dependencies(
   external_mesa
   ll
   external_zlib
+  # Run-time dependency.
+  external_expat
   # Needed for `MESON`.
   external_python_site_packages
 )



More information about the Bf-blender-cvs mailing list