[vcpkg baseline][libosip2] Use /Z7 rather than /Zi to avoid mspdbsrv …

…crashes. (#20758) * [libosip2] Use /Z7 rather than /Zi to avoid mspdbsrv crashes. * Fix version database
microsoft · Oct 16, 2021 · 3b08f52 · 3b08f52
1 parent 9114817
commit 3b08f52
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 15 deletions.
diff --git a/ports/libosip2/portfile.cmake b/ports/libosip2/portfile.cmake
@@ -6,46 +6,54 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 cc714ab5669c466ee8f0de78cf74a8b7633f3089bf104c9c1474326840db3d791270159456f9deb877af2df346b04493e8f796b2bb7d2be134f6c08b25a29f83
 )
 
+set(PATCHES)
 if(VCPKG_TARGET_IS_WINDOWS)
     list(APPEND PATCHES fix-path-in-project.patch)
 endif()
 
 vcpkg_extract_source_archive_ex(
-    ARCHIVE ${ARCHIVE}
+    ARCHIVE "${ARCHIVE}"
     OUT_SOURCE_PATH SOURCE_PATH
     PATCHES ${PATCHES}
 )
 
-if(VCPKG_TARGET_IS_WINDOWS)     
+if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_fail_port_install(ON_ARCH "arm" "arm64")
-
+
+    # Use /Z7 rather than /Zi to avoid "fatal error C1090: PDB API call failed, error code '23': (0x00000006)"
+    foreach(VCXPROJ IN ITEMS
+        "${SOURCE_PATH}/platform/vsnet/osip2.vcxproj"
+        "${SOURCE_PATH}/platform/vsnet/osipparser2.vcxproj")
+        vcpkg_replace_string(
+            "${VCXPROJ}"
+            "<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>"
+            "<DebugInformationFormat>OldStyle</DebugInformationFormat>"
+        )
+    endforeach()
+
     vcpkg_install_msbuild(
         SOURCE_PATH "${SOURCE_PATH}"
         PROJECT_SUBPATH "platform/vsnet/osip2.vcxproj"
         INCLUDES_SUBPATH include
         USE_VCPKG_INTEGRATION
-        REMOVE_ROOT_INCLUDES      
+        REMOVE_ROOT_INCLUDES
     )
-    
+
     vcpkg_install_msbuild(
         SOURCE_PATH "${SOURCE_PATH}"
         PROJECT_SUBPATH "platform/vsnet/osipparser2.vcxproj"
         USE_VCPKG_INTEGRATION
     )
 
 elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
-    vcpkg_configure_make(
-        SOURCE_PATH ${SOURCE_PATH}
-        OPTIONS ${OPTIONS}
-    )
-
+    vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}")
     vcpkg_install_make()
     vcpkg_fixup_pkgconfig()
-    
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 endif()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/libosip2/vcpkg.json b/ports/libosip2/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libosip2",
   "version": "5.2.0",
+  "port-version": 1,
   "description": "oSIP is an LGPL implementation of SIP. It's stable, portable, flexible and compliant! -may be more-! It is used mostly with eXosip2 stack (GPL) which provides simpler API for User-Agent implementation.",
   "homepage": "https://www.gnu.org/software/osip/",
   "supports": "!(windows & arm)",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3662,7 +3662,7 @@
     },
     "libosip2": {
       "baseline": "5.2.0",
-      "port-version": 0
+      "port-version": 1
     },
     "libosmium": {
       "baseline": "2.17.0",

diff --git a/versions/l-/libosip2.json b/versions/l-/libosip2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "918421395ccee5a5d894f2720b4a779369eb0f97",
+      "version": "5.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "468e53f1a4709f0b1b2b83efe23a2a4bc9dd63c2",
       "version": "5.2.0",