From f523208df4ae467436dc2d2eeab594fed240d552 Mon Sep 17 00:00:00 2001
From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com>
Date: Tue, 26 Nov 2024 19:24:24 -0800
Subject: [PATCH] [yasm] Repaired the PDB file that was overwritten due to
 having the same name (#42359)

---
 ports/yasm/fix-overlay-pdb.patch | 12 ++++++++++++
 ports/yasm/portfile.cmake        |  1 +
 ports/yasm/vcpkg.json            |  2 +-
 versions/baseline.json           |  2 +-
 versions/y-/yasm.json            |  5 +++++
 5 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 ports/yasm/fix-overlay-pdb.patch

diff --git a/ports/yasm/fix-overlay-pdb.patch b/ports/yasm/fix-overlay-pdb.patch
new file mode 100644
index 0000000000..336ff32f68
--- /dev/null
+++ b/ports/yasm/fix-overlay-pdb.patch
@@ -0,0 +1,12 @@
+diff --git a/frontends/yasm/CMakeLists.txt b/frontends/yasm/CMakeLists.txt
+index b11d7f8..b8306b1 100644
+--- a/frontends/yasm/CMakeLists.txt
++++ b/frontends/yasm/CMakeLists.txt
+@@ -19,6 +19,7 @@ IF(BUILD_SHARED_LIBS)
+         yasm-plugin.c
+         )
+     TARGET_LINK_LIBRARIES(yasm libyasm ${LIBDL})
++    set_target_properties(yasm PROPERTIES PDB_NAME "yasm-tool")
+ ELSE(BUILD_SHARED_LIBS)
+     ADD_EXECUTABLE(yasm
+         yasm.c
diff --git a/ports/yasm/portfile.cmake b/ports/yasm/portfile.cmake
index 966a9f8f2b..2ad6c6f9bb 100644
--- a/ports/yasm/portfile.cmake
+++ b/ports/yasm/portfile.cmake
@@ -7,6 +7,7 @@ vcpkg_from_github(
     PATCHES
         add-feature-tools.patch
         fix-arm-cross-build.patch
+        fix-overlay-pdb.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/ports/yasm/vcpkg.json b/ports/yasm/vcpkg.json
index b0bd940589..b6fc078e4d 100644
--- a/ports/yasm/vcpkg.json
+++ b/ports/yasm/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "yasm",
   "version": "1.3.0",
-  "port-version": 5,
+  "port-version": 6,
   "description": "Yasm is a complete rewrite of the NASM assembler under the new BSD License.",
   "homepage": "https://github.com/yasm/yasm",
   "license": "BSD-2-Clause OR BSD-3-Clause OR Artistic-1.0 OR GPL-2.0-only OR LGPL-2.0-only",
diff --git a/versions/baseline.json b/versions/baseline.json
index 27014b7a32..4ec7800ee4 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -9914,7 +9914,7 @@
     },
     "yasm": {
       "baseline": "1.3.0",
-      "port-version": 5
+      "port-version": 6
     },
     "yasm-tool": {
       "baseline": "2021-12-14",
diff --git a/versions/y-/yasm.json b/versions/y-/yasm.json
index 2611a7bf6b..dd34b8fc9d 100644
--- a/versions/y-/yasm.json
+++ b/versions/y-/yasm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cd30518fa90953d3fa7cc1c0096bf628d2b457be",
+      "version": "1.3.0",
+      "port-version": 6
+    },
     {
       "git-tree": "e9ad958de17f5b7661720dc322cff96b2dff8355",
       "version": "1.3.0",