Fix mac x86-64 build.

khustup2 · khustup2 · commit 1a8d36dcdc3c · 2025-08-10T09:02:59.000Z
diff --git a/.github/workflows/wheel-build.yaml b/.github/workflows/wheel-build.yaml
@@ -82,8 +82,7 @@ jobs:
       fail-fast: false
       matrix:
         include: ${{ fromJSON(needs.get_macos_matrix.outputs.matrix) }}
-    env:
-      VCPKG_BINARY_SOURCES: "clear;files,/Users/sre/GitHub/vcpkg-cache-deepframe-${{ matrix.type }},readwrite"
+
     steps:
       - name: set platform name
         id: platform-name
@@ -95,13 +94,23 @@ jobs:
             xlarge)
               echo "platform=macosx_11_0_arm64" >> $GITHUB_OUTPUT
               echo "arch=arm64" >> $GITHUB_OUTPUT
+              echo "triplet=arm64-osx" >> $GITHUB_OUTPUT
             ;;
             large)
               echo "platform=macosx_10_9_x86_64" >> $GITHUB_OUTPUT
               echo "arch=x86_64" >> $GITHUB_OUTPUT
+              echo "triplet=x64-osx" >> $GITHUB_OUTPUT
             ;;
           esac
 
+      - name: set vcpkg cache path
+        id: vcpkg-cache
+        shell: bash
+        env:
+          ARCH: ${{ steps.platform-name.outputs.arch }}
+        run: |
+          echo "cache_path=/Users/sre/GitHub/vcpkg-cache-deepframe-${{ steps.platform-name.outputs.triplet }}" >> $GITHUB_OUTPUT
+
       - name: clone repository
         uses: actions/checkout@v4.2.2
 
@@ -125,14 +134,42 @@ jobs:
         shell: bash
         run: git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 6f29f12e82a8293156836ad81cc9bf5af41fe836 && ./bootstrap-vcpkg.sh
 
+      - name: install vcpkg dependencies
+        shell: bash
+        env:
+          VCPKG_ROOT: ${{ github.workspace }}/vcpkg
+          VCPKG_TARGET_TRIPLET: ${{ steps.platform-name.outputs.triplet }}
+          VCPKG_HOST_TRIPLET: ${{ steps.platform-name.outputs.triplet }}
+        run: |
+          cd vcpkg
+          ./vcpkg install --triplet=${{ steps.platform-name.outputs.triplet }} openssl liblzma libiconv zlib
+          cd ..
+
+      - name: clean build artifacts
+        shell: bash
+        run: |
+          # Clean build directory to ensure fresh build
+          rm -rf build
+          # Clean architecture-specific FFmpeg installations
+          rm -rf .ext-*
+
+
+
       - name: build py${{ matrix.python }}
         env:
           CMAKE_OSX_ARCHITECTURES: ${{ steps.platform-name.outputs.arch }}
+          VCPKG_TARGET_TRIPLET: ${{ steps.platform-name.outputs.triplet }}
+          VCPKG_HOST_TRIPLET: ${{ steps.platform-name.outputs.triplet }}
+          VCPKG_BINARY_SOURCES: "clear"
+          VCPKG_DISABLE_METRICS: true
+          VCPKG_OVERLAY_TRIPLETS: ""
+          VCPKG_OVERLAY_PORTS: ""
         shell: bash
         run: |-
           CMAKE_PATH=$(whereis cmake | awk '{print $2}')
           CMAKE_DIR=$(dirname "$CMAKE_PATH")
           echo "$CMAKE_DIR" >> $GITHUB_PATH
+          
           source "venv_${{ matrix.venv }}/bin/activate"
           python"${{ matrix.python }}" -m pip install -r requirements-dev.txt &&
           python"${{ matrix.python }}" scripts/build.py "${{ env.BUILD_PRESET }}"
diff --git a/cmake/modules/findFFmpeg.cmake b/cmake/modules/findFFmpeg.cmake
@@ -1,13 +1,35 @@
 include(ExternalProject)  
 
 set(DEFAULT_PARENT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../)
-set(ffmpeg_BUILD_INSTALL_PREFIX ${DEFAULT_PARENT_DIR}/.ext)
+
+# Make installation directory architecture-specific
+# Use target architecture from CMAKE_OSX_ARCHITECTURES for cross-compilation
+if(APPLE)
+    if (CMAKE_OSX_ARCHITECTURES MATCHES "arm64")
+        set(ffmpeg_INSTALL_DIR "${DEFAULT_PARENT_DIR}/.ext-arm64")
+        set(ffmpeg_BUILD_INSTALL_PREFIX ${DEFAULT_PARENT_DIR}/.ext-arm64)
+        set(ffmpeg_SOURCE_DIR ${DEFAULT_PARENT_DIR}/.ext-arm64/ffmpeg)
+    elseif(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
+        set(ffmpeg_INSTALL_DIR "${DEFAULT_PARENT_DIR}/.ext-x86_64")
+        set(ffmpeg_BUILD_INSTALL_PREFIX ${DEFAULT_PARENT_DIR}/.ext-x86_64)
+        set(ffmpeg_SOURCE_DIR ${DEFAULT_PARENT_DIR}/.ext-x86_64/ffmpeg)
+    endif()
+elseif(UNIX)
+    if(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL aarch64)
+        set(ffmpeg_INSTALL_DIR "${DEFAULT_PARENT_DIR}/.ext-aarch64")
+        set(ffmpeg_BUILD_INSTALL_PREFIX ${DEFAULT_PARENT_DIR}/.ext-aarch64)
+        set(ffmpeg_SOURCE_DIR ${DEFAULT_PARENT_DIR}/.ext-aarch64/ffmpeg)
+    elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL x86_64)
+        set(ffmpeg_INSTALL_DIR "${DEFAULT_PARENT_DIR}/.ext-x86_64")
+        set(ffmpeg_BUILD_INSTALL_PREFIX ${DEFAULT_PARENT_DIR}/.ext-x86_64)
+        set(ffmpeg_SOURCE_DIR ${DEFAULT_PARENT_DIR}/.ext-x86_64/ffmpeg)
+    endif()
+endif()
+
 set(ffmpeg_URL "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n7.1.tar.gz")
-set(ffmpeg_SOURCE_DIR ${DEFAULT_PARENT_DIR}/.ext/ffmpeg)
 set(ffmpeg_SHA256_HASH 7ddad2d992bd250a6c56053c26029f7e728bebf0f37f80cf3f8a0e6ec706431a)
-set(ffmpeg_INSTALL_DIR "${DEFAULT_PARENT_DIR}/.ext")
 
-set(ffmpeg_PKG_CONFIG_PATH "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/pkgconfig:${DEFAULT_PARENT_DIR}/.ext/lib/pkgconfig")
+set(ffmpeg_PKG_CONFIG_PATH "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/pkgconfig:${ffmpeg_INSTALL_DIR}/lib/pkgconfig")
 
 macro(check_lib_existence LIB_NAME)
     find_path(${LIB_NAME}_EXISTS
@@ -37,9 +59,9 @@ macro(build_ffmpeg_once)
         set(EXTRA_ARGUMENTS)
         if(APPLE)
             list(APPEND EXTRA_ARGUMENTS "--target-os=darwin")
-            if (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL arm64)
+            if (CMAKE_OSX_ARCHITECTURES MATCHES "arm64")
                 list(APPEND EXTRA_ARGUMENTS "--arch=arm64")
-            elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64)
+            elseif(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
                 list(APPEND EXTRA_ARGUMENTS "--arch=x86_64")
             endif()
         elseif(UNIX)
@@ -54,13 +76,21 @@ macro(build_ffmpeg_once)
         set(FFMPEG_EP_DEPENDS)
 
         message(STATUS "Building FFmpeg with extra arguments: ${EXTRA_ARGUMENTS}")
+        message(STATUS "FFmpeg target architecture: ${CMAKE_OSX_ARCHITECTURES}")
+        message(STATUS "VCPKG_TARGET_TRIPLET: ${VCPKG_TARGET_TRIPLET}")
+        message(STATUS "FFmpeg install directory: ${ffmpeg_INSTALL_DIR}")
 
         ExternalProject_Add(ffmpeg_ep
             SOURCE_DIR ${ffmpeg_SOURCE_DIR}
             URL ${ffmpeg_URL}
             URL_HASH SHA256=${ffmpeg_SHA256_HASH}
             CONFIGURE_COMMAND
-                ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${ffmpeg_PKG_CONFIG_PATH} ${ffmpeg_SOURCE_DIR}/configure
+                ${CMAKE_COMMAND} -E env 
+                    PKG_CONFIG_PATH=${ffmpeg_PKG_CONFIG_PATH}
+                    VCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}
+                    VCPKG_HOST_TRIPLET=${VCPKG_HOST_TRIPLET}
+                    CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+                    ${ffmpeg_SOURCE_DIR}/configure
                     --quiet
                     --prefix=${ffmpeg_INSTALL_DIR}
                     --disable-programs
@@ -90,8 +120,18 @@ macro(build_ffmpeg_once)
             BUILD_IN_SOURCE TRUE
             PATCH_COMMAND 
                 patch -p1 < ${DEFAULT_PARENT_DIR}/cmake/modules/url_max_length_fix.patch
-            BUILD_COMMAND $(MAKE)
-            INSTALL_COMMAND $(MAKE) install
+            BUILD_COMMAND 
+                ${CMAKE_COMMAND} -E env 
+                    VCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}
+                    VCPKG_HOST_TRIPLET=${VCPKG_HOST_TRIPLET}
+                    CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+                    $(MAKE)
+            INSTALL_COMMAND 
+                ${CMAKE_COMMAND} -E env 
+                    VCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}
+                    VCPKG_HOST_TRIPLET=${VCPKG_HOST_TRIPLET}
+                    CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+                    $(MAKE) install
             DEPENDS ${FFMPEG_EP_DEPENDS}
             ${EP_LOG_OPTIONS}
         )
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -4,11 +4,30 @@ if (NOT DEFINED ENV{VCPKG_ROOT})
     message(FATAL_ERROR "You must set VCPKG_ROOT environment variable to point to your vcpkg installation")
 endif ()
 
+# Set vcpkg triplet before including the toolchain
+if (DEFINED ENV{VCPKG_TARGET_TRIPLET})
+    set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_TARGET_TRIPLET}" CACHE STRING "Vcpkg target triplet")
+    message(STATUS "Setting VCPKG_TARGET_TRIPLET: ${VCPKG_TARGET_TRIPLET}")
+endif()
+
+if (DEFINED ENV{VCPKG_HOST_TRIPLET})
+    set(VCPKG_HOST_TRIPLET "$ENV{VCPKG_HOST_TRIPLET}" CACHE STRING "Vcpkg host triplet")
+    message(STATUS "Setting VCPKG_HOST_TRIPLET: ${VCPKG_HOST_TRIPLET}")
+endif()
+
 set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file")
 message(STATUS "Using toolchain file: ${CMAKE_TOOLCHAIN_FILE}")
 
 project(deepframe_project LANGUAGES CXX)
 
+# Verify cross-compilation setup
+if (APPLE AND DEFINED CMAKE_OSX_ARCHITECTURES)
+    message(STATUS "Target architecture: ${CMAKE_OSX_ARCHITECTURES}")
+    if (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
+        message(STATUS "Cross-compiling x86_64 on ARM64 host")
+    endif()
+endif()
+
 # Set C++ standard
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
