[libpq] Fix ios build (#26906)

microsoft · Sep 26, 2022 · 6ca56ae · 6ca56ae
1 parent 143bc76
commit 6ca56ae
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake
@@ -287,8 +287,10 @@ else()
     if(VCPKG_TARGET_IS_ANDROID) # AND CMAKE_SYSTEM_VERSION LESS 26)
         list(APPEND BUILD_OPTS ac_cv_header_langinfo_h=no)
     endif()
-    if(VCPKG_OSX_SYSROOT)
-        list(APPEND BUILD_OPTS "PG_SYSROOT=${VCPKG_OSX_SYSROOT}")
+    vcpkg_cmake_get_vars(cmake_vars_file)
+    include("${cmake_vars_file}")
+    if(VCPKG_DETECTED_CMAKE_OSX_SYSROOT)
+        list(APPEND BUILD_OPTS "PG_SYSROOT=${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}")
     endif()
     vcpkg_configure_make(
         AUTOCONFIG

diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libpq",
   "version": "14.4",
+  "port-version": 1,
   "description": "The official database access API of postgresql",
   "homepage": "https://www.postgresql.org/",
   "license": "PostgreSQL",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4034,7 +4034,7 @@
     },
     "libpq": {
       "baseline": "14.4",
-      "port-version": 0
+      "port-version": 1
     },
     "libpqxx": {
       "baseline": "7.7.3",

diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bdf23f137f7f72e57555542fc392a8ec8e0ebd28",
+      "version": "14.4",
+      "port-version": 1
+    },
     {
       "git-tree": "2b3456bfb8b04525c44007f3c8a04b7e208d639d",
       "version": "14.4",