Take gperf from vcpkg tool if possible

microsoft · May 26, 2022 · fcf0b34 · fcf0b34
1 parent 20907dc
commit fcf0b34
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake
@@ -12,9 +12,7 @@ vcpkg_from_gitlab(
         libgetopt.patch
 )
 
-vcpkg_find_acquire_program(GPERF)
-get_filename_component(GPERF_PATH ${GPERF} DIRECTORY)
-vcpkg_add_to_path(${GPERF_PATH})
+vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/")
 
 vcpkg_configure_meson(
     SOURCE_PATH ${SOURCE_PATH}

diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "fontconfig",
   "version": "2.14.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Library for configuring and customizing font access.",
   "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig",
   "license": "MIT",
@@ -11,6 +11,10 @@
     "freetype",
     "getopt",
     "gettext",
+    {
+      "name": "gperf",
+      "host": true
+    },
     "libiconv",
     {
       "name": "libuuid",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2290,7 +2290,7 @@
     },
     "fontconfig": {
       "baseline": "2.14.0",
-      "port-version": 1
+      "port-version": 2
     },
     "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": "54f599dd541f7721dcc68e06c328e55098d0f9b5",
+      "version": "2.14.0",
+      "port-version": 2
+    },
     {
       "git-tree": "b1b1de99dba230f78c88bb9d73329bed77227ad4",
       "version": "2.14.0",