diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index 887846569ac269..f6a0e0748d311a 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -70,8 +70,12 @@ file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_CROSSCOMPILING) set(ENV{FONTCONFIG_PATH} "${CURRENT_PACKAGES_DIR}/etc/fonts") set(ENV{FONTCONFIG_FILE} "${CURRENT_PACKAGES_DIR}/etc/fonts/fonts.conf") - vcpkg_execute_required_process(COMMAND "${CURRENT_PACKAGES_DIR}/bin/fc-cache${VCPKG_TARGET_EXECUTABLE_SUFFIX}" --verbose - WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin" + + # When build on x64-osx host for arm64-osx target, VCPKG_CROSSCOMPILING is not set + set(TOOLS_DIR "${CURRENT_HOST_INSTALLED_DIR}/tools/fontconfig") + + vcpkg_execute_required_process(COMMAND "${TOOLS_DIR}/bin/fc-cache${VCPKG_TARGET_EXECUTABLE_SUFFIX}" --verbose + WORKING_DIRECTORY "${TOOLS_DIR}/bin" LOGNAME fc-cache-${TARGET_TRIPLET}) endif() diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json index 9d260f08db1052..7d6264ffa64126 100644 --- a/ports/fontconfig/vcpkg.json +++ b/ports/fontconfig/vcpkg.json @@ -1,12 +1,17 @@ { "name": "fontconfig", "version": "2.13.94", - "port-version": 5, + "port-version": 6, "description": "Library for configuring and customizing font access.", "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig", "dependencies": [ "dirent", "expat", + { + "name": "fontconfig", + "host": true, + "platform": "osx" + }, "freetype", "gettext", "json-c", diff --git a/versions/baseline.json b/versions/baseline.json index 9eee1d13bb39df..a22f4d5b908a24 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2242,7 +2242,7 @@ }, "fontconfig": { "baseline": "2.13.94", - "port-version": 5 + "port-version": 6 }, "foonathan-memory": { "baseline": "2019-07-21", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index c5d5a8d137b37b..e47da36001bdff 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ca1394bfb75ef425ddc306f82915db9485cc01d", + "version": "2.13.94", + "port-version": 6 + }, { "git-tree": "2f32046747209c234e60dc297b48d5bdc7ee4494", "version": "2.13.94",