From a3d780b5e68db30ea921d2cf2b6bb42346bf14e5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 9 Jan 2023 06:38:28 +0100 Subject: [PATCH] [libxslt] Fix static usage (#28786) --- ports/libxslt/portfile.cmake | 6 ++---- ports/libxslt/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libxslt.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index 275644836c4..d2ac80d90a6 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -61,12 +61,10 @@ vcpkg_copy_tools(TOOL_NAMES xsltproc AUTO_CLEAN) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -set(not_static 1) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(not_static 0) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libxslt/xsltexports.h" "ifdef LIBXSLT_STATIC" "if 1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h" "ifdef LIBEXSLT_STATIC" "if 1") endif() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libxslt/xsltexports.h" "!defined(LIBXSLT_STATIC)" "${not_static}") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h" "!defined(LIBEXSLT_STATIC)" "${not_static}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libxslt/vcpkg.json b/ports/libxslt/vcpkg.json index 3526b489dcb..e5b9489b61b 100644 --- a/ports/libxslt/vcpkg.json +++ b/ports/libxslt/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libxslt", "version": "1.1.37", + "port-version": 1, "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT", "homepage": "https://github.com/GNOME/libxslt", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index d3ab5926abc..2562df60cf0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4558,7 +4558,7 @@ }, "libxslt": { "baseline": "1.1.37", - "port-version": 0 + "port-version": 1 }, "libxt": { "baseline": "1.2.1", diff --git a/versions/l-/libxslt.json b/versions/l-/libxslt.json index 0c97d9e82e2..2f867897ae9 100644 --- a/versions/l-/libxslt.json +++ b/versions/l-/libxslt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e2ad3abc4c5d53f33c43f0a1b7aa09ca7e06dc1", + "version": "1.1.37", + "port-version": 1 + }, { "git-tree": "9aebd365040f19a4060880bbf942aeda189e94ed", "version": "1.1.37",