[libxslt] Remove unneeded helper (#21480)

* [libxslt] Remove unneeded helper * [libxslt] Fix release-only builds for Linux
microsoft · Nov 17, 2021 · 1a5075b · 1a5075b
1 parent a4b5cde
commit 1a5075b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake
@@ -98,8 +98,10 @@ if (VCPKG_TARGET_IS_WINDOWS)
         # Rename the libs to match the dynamic lib names
         file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}")
         file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}")
+        if(NOT VCPKG_BUILD_TYPE)
+            file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}")
+            file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}")
+        endif()
     endif()
 
     set(prefix "")
@@ -146,7 +148,9 @@ else()
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libxslt/man3")
 
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/bin/xslt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/bin/xslt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../../")
+    if(NOT VCPKG_BUILD_TYPE)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/bin/xslt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../../")
+    endif()
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libxslt/xsltconfig.h" "#define LIBXSLT_DEFAULT_PLUGINS_PATH() \"${CURRENT_INSTALLED_DIR}/lib/libxslt-plugins\"" "")
 endif()
 

diff --git a/ports/libxslt/vcpkg.json b/ports/libxslt/vcpkg.json
@@ -1,17 +1,12 @@
 {
   "name": "libxslt",
   "version": "1.1.34",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT",
   "homepage": "https://github.com/GNOME/libxslt",
   "supports": "!uwp",
   "dependencies": [
     "liblzma",
-    "libxml2",
-    {
-      "name": "vcpkg-pkgconfig-get-modules",
-      "host": true,
-      "platform": "!windows"
-    }
+    "libxml2"
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4062,7 +4062,7 @@
     },
     "libxslt": {
       "baseline": "1.1.34",
-      "port-version": 2
+      "port-version": 3
     },
     "libyaml": {
       "baseline": "0.2.5",

diff --git a/versions/l-/libxslt.json b/versions/l-/libxslt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f139a7054e2347bc0f48ba6cabe14a74e7d1db36",
+      "version": "1.1.34",
+      "port-version": 3
+    },
     {
       "git-tree": "0f0b69e249f116b5e20999f9c4c16004093b49ec",
       "version": "1.1.34",