fix moltenvk build

Author: debugly

configs/libs/shaderc.sh

@@ -16,7 +16,7 @@
 #
 
 export LIB_NAME='shaderc'
-export LIPO_LIBS="libshaderc libshaderc_combined"
+export LIPO_LIBS="libshaderc_combined"
 export LIB_DEPENDS_BIN="cmake"
 export GIT_LOCAL_REPO=extra/shaderc
 export GIT_COMMIT=v2025.3

do-compile/apple/moltenvk.sh

@@ -16,6 +16,7 @@
 #
 
 set -e
+set -o pipefail
 
 THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
 cd "$THIS_DIR"
@@ -74,7 +75,7 @@ echo "[*] fetch dependencies for $LIB_NAME"
 echo "----------------------"
 
 cd $MR_BUILD_SOURCE
-if [ -d "External" ]; then
+if [ -d "External/build" ]; then
     echo "dependencies already exist"
 else
     if [ -f "./fetchDependencies" ]; then
@@ -105,11 +106,8 @@ xcodebuild -project "$MR_BUILD_SOURCE/MoltenVKPackaging.xcodeproj" \
     -scheme "MoltenVK Package ($scheme_suffix)" \
     -destination "generic/platform=$dest" \
     -configuration Release \
-    -parallelizeTargets \
-    ONLY_ACTIVE_ARCH=YES \
-    ARCHS="$arch_param" \
     CODE_SIGNING_ALLOWED=NO \
-    build || true
+    build
 
 pkg_static_dir="$MR_BUILD_SOURCE/Package/Release/MoltenVK/static"
 if [[ -d "$pkg_static_dir/MoltenVK.xcframework" ]]; then
@@ -143,3 +141,47 @@ if [[ -d "$vk_video_headers" ]]; then
     cp -RL "$vk_video_headers"/* "$MR_BUILD_PREFIX/include/vk_video/"
     echo "Copied vk_video headers to $MR_BUILD_PREFIX/include/vk_video/"
 fi
+
+echo "----------------------"
+echo "[*] generate pkg-config files"
+echo "----------------------"
+
+mkdir -p "$MR_BUILD_PREFIX/lib/pkgconfig"
+
+MOLTENVK_MAJOR=$(grep "MVK_VERSION_MAJOR" "$MR_BUILD_PREFIX/include/MoltenVK/mvk_private_api.h" | grep -oE "[0-9]+" | head -1)
+MOLTENVK_MINOR=$(grep "MVK_VERSION_MINOR" "$MR_BUILD_PREFIX/include/MoltenVK/mvk_private_api.h" | grep -oE "[0-9]+" | head -1)
+MOLTENVK_PATCH=$(grep "MVK_VERSION_PATCH" "$MR_BUILD_PREFIX/include/MoltenVK/mvk_private_api.h" | grep -oE "[0-9]+" | head -1)
+MOLTENVK_VERSION="${MOLTENVK_MAJOR}.${MOLTENVK_MINOR}.${MOLTENVK_PATCH}"
+
+VULKAN_VERSION="1.3.250"
+
+cat > "$MR_BUILD_PREFIX/lib/pkgconfig/vulkan.pc" << EOF
+prefix=${MR_BUILD_PREFIX}
+exec_prefix=\${prefix}
+libdir=\${exec_prefix}/lib
+includedir=\${prefix}/include
+
+Name: Vulkan
+Description: Vulkan loader (MoltenVK)
+Version: ${VULKAN_VERSION}
+Libs: -L\${libdir} -lMoltenVK
+Libs.private: -framework Metal -framework Foundation -framework QuartzCore -framework IOKit -framework IOSurface -lc++
+Cflags: -I\${includedir} -I\${includedir}/vulkan
+EOF
+
+cat > "$MR_BUILD_PREFIX/lib/pkgconfig/moltenvk.pc" << EOF
+prefix=${MR_BUILD_PREFIX}
+exec_prefix=\${prefix}
+libdir=\${exec_prefix}/lib
+includedir=\${prefix}/include
+
+Name: MoltenVK
+Description: Vulkan implementation on Metal for macOS and iOS
+Version: ${MOLTENVK_VERSION}
+Libs: -L\${libdir} -lMoltenVK
+Libs.private: -framework Metal -framework Foundation -framework QuartzCore -framework IOKit -framework IOSurface -lc++
+Cflags: -I\${includedir} -I\${includedir}/vulkan -I\${includedir}/MoltenVK
+Requires: vulkan
+EOF
+
+echo "Generated vulkan.pc (${VULKAN_VERSION}) and moltenvk.pc (${MOLTENVK_VERSION})"

do-compile/apple/placebo.sh

@@ -33,6 +33,10 @@ sed -i '' 's/registry = VkXML(ET.parse(xmlfile))/registry = VkXML(ET.parse(xmlfi
 
 cd "$THIS_DIR"
 
+BUILD_DIR="${MR_BUILD_SOURCE}/meson_build"
+rm -rf "$BUILD_DIR"
+mkdir -p "$BUILD_DIR"
+
 echo "----------------------"
 echo "[*] configure $LIB_NAME"
 echo "----------------------"
@@ -42,7 +46,6 @@ echo "----------------------"
 # Use shaderc for SPIRV compilation
 
 # Find lcms2 and shaderc from our build
-PKG_CONFIG_PATH="${MR_BUILD_PREFIX}/lib/pkgconfig:$PKG_CONFIG_PATH"
 
 # Set deployment target for macOS
 export MACOSX_DEPLOYMENT_TARGET=11.0
@@ -61,25 +64,32 @@ MESON_OPTS="--buildtype=release \
 -Ddemos=false \
 -Dxxhash=disabled"
 
-build="${MR_BUILD_SOURCE}/meson_build"
-rm -rf "$build"
-mkdir -p "$build"
-cd "$build"
 
 # Set up environment for MoltenVK
 export VK_ICD_FILENAMES="${MR_BUILD_PREFIX}/share/vulkan/icd.d/MoltenVK_icd.json"
 
 # Disable assertions to fix Xcode SDK compatibility issue
-export CFLAGS="-U_LIBCPP_ENABLE_ASSERTIONS"
-export CXXFLAGS="-U_LIBCPP_ENABLE_ASSERTIONS"
+# IMPORTANT: Preserve original CFLAGS which contains -arch parameter
+export CFLAGS="${MR_DEFAULT_CFLAGS} -U_LIBCPP_ENABLE_ASSERTIONS"
+export CXXFLAGS="${MR_DEFAULT_CFLAGS} -U_LIBCPP_ENABLE_ASSERTIONS"
+
+# Add shaderc and MoltenVK pkgconfig paths
+# SHADERC_PC_PATH="${MR_UNI_PROD_DIR}/shaderc/lib/pkgconfig"
+# MOLTENVK_PC_PATH="${MR_UNI_PROD_DIR}/MoltenVK/lib/pkgconfig"
+# export PKG_CONFIG_PATH="${SHADERC_PC_PATH}:${MOLTENVK_PC_PATH}:${PKG_CONFIG_PATH}"
 
-meson setup . ${MR_BUILD_SOURCE} ${MESON_OPTS}
+# # Configure with explicit PKG_CONFIG_LIBDIR to avoid system dependencies
+# PKG_CONFIG_LIBDIR="${SHADERC_PC_PATH}:${MOLTENVK_PC_PATH}:$PKG_CONFIG_LIBDIR" \
+# PKG_CONFIG_ALLOW_SYSTEM_LIBS=0 \
+meson setup ${BUILD_DIR} ${MR_BUILD_SOURCE} ${MESON_OPTS}
 
 echo "----------------------"
 echo "[*] compile $LIB_NAME"
 echo "----------------------"
 
-ninja
+cd "$BUILD_DIR"
+
+meson compile
 
 echo "----------------------"
 echo "[*] install $LIB_NAME"

do-compile/apple/shaderc.sh

@@ -73,6 +73,7 @@ mkdir -p "$build"
 cd "$build"
 
 cmake -S ${MR_BUILD_SOURCE} \
+    -DCMAKE_PREFIX_PATH=${PKG_CONFIG_LIBDIR} \
     -DCMAKE_INSTALL_PREFIX=${MR_BUILD_PREFIX} \
     -DCMAKE_TOOLCHAIN_FILE="${MR_SHELL_TOOLS_DIR}/ios.toolchain.cmake" \
     -DPLATFORM=$pf \
@@ -94,3 +95,9 @@ echo "[*] install $LIB_NAME"
 echo "----------------------"
 
 cmake --install .
+
+# clean up pkgconfig files
+rm -f ${MR_BUILD_PREFIX}/lib/pkgconfig/SPIRV-Tools-shared.pc
+rm -f ${MR_BUILD_PREFIX}/lib/pkgconfig/SPIRV-Tools.pc
+rm -f ${MR_BUILD_PREFIX}/lib/pkgconfig/shaderc.pc
+rm -f ${MR_BUILD_PREFIX}/lib/pkgconfig/shaderc_static.pc

tools/export-apple-host-env.sh

@@ -19,12 +19,20 @@ if [[ "$MR_PLAT" != 'macos' ]]; then
     export MR_FORCE_CROSS=true
 fi
 
-if [[ "$MR_PLAT" == 'ios' ]]; then
-    export MR_DEFAULT_ARCHS="arm64 arm64_simulator x86_64_simulator"
+if [[ "$MR_VENDOR_LIBS" == *"moltenvk"* || "$MR_VENDOR_LIBS" == "moltenvk" ]]; then
+    if [[ "$MR_PLAT" == 'macos' ]]; then
+        export MR_DEFAULT_ARCHS="arm64"
+    elif [[ "$MR_PLAT" == 'ios' || "$MR_PLAT" == 'tvos' ]]; then
+        export MR_DEFAULT_ARCHS="arm64 arm64_simulator"
+    fi
+else
+    if [[ "$MR_PLAT" == 'ios' ]]; then
+        export MR_DEFAULT_ARCHS="arm64 arm64_simulator x86_64_simulator"
     elif [[ "$MR_PLAT" == 'macos' ]]; then
-    export MR_DEFAULT_ARCHS="x86_64 arm64"
+        export MR_DEFAULT_ARCHS="x86_64 arm64"
     elif [[ "$MR_PLAT" == 'tvos' ]]; then
-    export MR_DEFAULT_ARCHS="arm64 arm64_simulator x86_64_simulator"
+        export MR_DEFAULT_ARCHS="arm64 arm64_simulator x86_64_simulator"
+    fi
 fi
 
 # Number of physical cores in the system to facilitate parallel assembling