From 247662ef304453c72acd6b520fa7ff7656e7347c Mon Sep 17 00:00:00 2001
From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com>
Date: Tue, 8 Aug 2023 11:40:51 -0700
Subject: [PATCH] [libusb] Use /Z7 to embed the PDB into the executable
 (#33010)

---
 ports/libusb/portfile.cmake | 7 +++++++
 ports/libusb/vcpkg.json     | 2 +-
 versions/baseline.json      | 2 +-
 versions/l-/libusb.json     | 5 +++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ports/libusb/portfile.cmake b/ports/libusb/portfile.cmake
index c31c37514b..595d5f92fd 100644
--- a/ports/libusb/portfile.cmake
+++ b/ports/libusb/portfile.cmake
@@ -26,6 +26,13 @@ function(replace_runtime_library PROJ_FILE)
 endfunction(replace_runtime_library)
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+  # Use /Z7 to embed debug information into the executable
+  vcpkg_replace_string(
+      "${SOURCE_PATH}/msvc/Base.props"
+      "<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>"
+      "<DebugInformationFormat>OldStyle</DebugInformationFormat>"
+  )
+
   if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
       set(LIBUSB_PROJECT_TYPE dll)
   else()
diff --git a/ports/libusb/vcpkg.json b/ports/libusb/vcpkg.json
index 05e41dad17..4fc34433af 100644
--- a/ports/libusb/vcpkg.json
+++ b/ports/libusb/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libusb",
   "version": "1.0.26.11791",
-  "port-version": 1,
+  "port-version": 2,
   "description": "a cross-platform library to access USB devices",
   "homepage": "https://github.com/libusb/libusb",
   "license": "LGPL-2.1-or-later",
diff --git a/versions/baseline.json b/versions/baseline.json
index 2f6102713c..18ccdeeabc 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4750,7 +4750,7 @@
     },
     "libusb": {
       "baseline": "1.0.26.11791",
-      "port-version": 1
+      "port-version": 2
     },
     "libusb-win32": {
       "baseline": "1.2.6.0",
diff --git a/versions/l-/libusb.json b/versions/l-/libusb.json
index 881187a43c..6ffeab99f4 100644
--- a/versions/l-/libusb.json
+++ b/versions/l-/libusb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "87cd196b403364febf719d64fe6f08ab0bf6b285",
+      "version": "1.0.26.11791",
+      "port-version": 2
+    },
     {
       "git-tree": "653d47743e90abaa28a3d17b49fe479a0096f8ef",
       "version": "1.0.26.11791",