[fontconfig] don't build font cache in case of crosscompile (#22483)

microsoft · Jan 12, 2022 · 95c1b6f · 95c1b6f
1 parent 7180c62
commit 95c1b6f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake
@@ -67,7 +67,7 @@ file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share
 
 
 # Build the fontconfig cache
-if(NOT VCPKG_TARGET_IS_WINDOWS)
+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

diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "fontconfig",
   "version": "2.13.94",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Library for configuring and customizing font access.",
   "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig",
   "dependencies": [

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2230,7 +2230,7 @@
     },
     "fontconfig": {
       "baseline": "2.13.94",
-      "port-version": 4
+      "port-version": 5
     },
     "foonathan-memory": {
       "baseline": "2019-07-21",

diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2f32046747209c234e60dc297b48d5bdc7ee4494",
+      "version": "2.13.94",
+      "port-version": 5
+    },
     {
       "git-tree": "41142efe19b6591f0de47857a32fecdb8bbfc717",
       "version": "2.13.94",