From ecdff26160555ba670171a8159bc886e49713327 Mon Sep 17 00:00:00 2001
From: Vitalii Koshura <lestat.de.lionkur@gmail.com>
Date: Tue, 19 Dec 2023 00:25:01 +0300
Subject: [PATCH] [libsystemd] Fix build when specifying release-only build
 (#35737)

---
 ports/libsystemd/portfile.cmake | 16 ++++++++++------
 ports/libsystemd/vcpkg.json     |  2 +-
 versions/baseline.json          |  2 +-
 versions/l-/libsystemd.json     |  5 +++++
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ports/libsystemd/portfile.cmake b/ports/libsystemd/portfile.cmake
index f6ba7b58f3..2db5d2866d 100644
--- a/ports/libsystemd/portfile.cmake
+++ b/ports/libsystemd/portfile.cmake
@@ -41,15 +41,19 @@ else()
   file(INSTALL "${BUILD_DIR_RELEASE}/libsystemd.so" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" FOLLOW_SYMLINK_CHAIN)
 endif()
 
-set(BUILD_DIR_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-  file(INSTALL "${BUILD_DIR_DEBUG}/libsystemd.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-else()
-  file(INSTALL "${BUILD_DIR_DEBUG}/libsystemd.so" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FOLLOW_SYMLINK_CHAIN)
+if(NOT VCPKG_BUILD_TYPE)
+  set(BUILD_DIR_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
+  if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(INSTALL "${BUILD_DIR_DEBUG}/libsystemd.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+  else()
+    file(INSTALL "${BUILD_DIR_DEBUG}/libsystemd.so" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FOLLOW_SYMLINK_CHAIN)
+  endif()
 endif()
 
 file(INSTALL "${BUILD_DIR_RELEASE}/src/libsystemd/libsystemd.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
-file(INSTALL "${BUILD_DIR_DEBUG}/src/libsystemd/libsystemd.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+if(NOT VCPKG_BUILD_TYPE)
+  file(INSTALL "${BUILD_DIR_DEBUG}/src/libsystemd/libsystemd.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+endif()
 
 vcpkg_fixup_pkgconfig()
 
diff --git a/ports/libsystemd/vcpkg.json b/ports/libsystemd/vcpkg.json
index a0a36196f2..71bd376559 100644
--- a/ports/libsystemd/vcpkg.json
+++ b/ports/libsystemd/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libsystemd",
   "version": "254",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Libsystemd",
   "homepage": "https://github.com/systemd/systemd",
   "license": "LGPL-2.1+",
diff --git a/versions/baseline.json b/versions/baseline.json
index 944b98ba94..a569096fc5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4882,7 +4882,7 @@
     },
     "libsystemd": {
       "baseline": "254",
-      "port-version": 1
+      "port-version": 2
     },
     "libtar": {
       "baseline": "1.2.20",
diff --git a/versions/l-/libsystemd.json b/versions/l-/libsystemd.json
index 94b4c47368..984f74d842 100644
--- a/versions/l-/libsystemd.json
+++ b/versions/l-/libsystemd.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5213227454790bf5e953a66d807e04059742381e",
+      "version": "254",
+      "port-version": 2
+    },
     {
       "git-tree": "2ac525bd287e8a58992f263adce78483b0513cb0",
       "version": "254",