From d3f74469ee263a128e27a49af5e4b3a4396c0163 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 29 Jul 2022 00:21:33 +0200 Subject: [PATCH] [libxslt] fix export statements for clang-cl (#26003) * fix libxslt export statement to include extern for clang-cl * v db --- ports/libxslt/extern_export.patch | 30 ++++++++++++++++++++++++++++++ ports/libxslt/portfile.cmake | 1 + ports/libxslt/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libxslt.json | 5 +++++ 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 ports/libxslt/extern_export.patch diff --git a/ports/libxslt/extern_export.patch b/ports/libxslt/extern_export.patch new file mode 100644 index 0000000000..df82ab5dc7 --- /dev/null +++ b/ports/libxslt/extern_export.patch @@ -0,0 +1,30 @@ +diff --git a/libexslt/exsltexports.h b/libexslt/exsltexports.h +index 381567e0a..5088e0ec4 100644 +--- a/libexslt/exsltexports.h ++++ b/libexslt/exsltexports.h +@@ -48,8 +48,8 @@ + #undef EXSLTPUBVAR + #undef EXSLTCALL + #if defined(IN_LIBEXSLT) && !defined(LIBEXSLT_STATIC) +- #define EXSLTPUBFUN __declspec(dllexport) +- #define EXSLTPUBVAR __declspec(dllexport) ++ #define EXSLTPUBFUN extern __declspec(dllexport) ++ #define EXSLTPUBVAR extern __declspec(dllexport) + #else + #define EXSLTPUBFUN + #if !defined(LIBEXSLT_STATIC) +diff --git a/libxslt/xsltexports.h b/libxslt/xsltexports.h +index 99b6ac387..bbc556fb6 100644 +--- a/libxslt/xsltexports.h ++++ b/libxslt/xsltexports.h +@@ -50,8 +50,8 @@ + #undef XSLTPUBVAR + #undef XSLTCALL + #if defined(IN_LIBXSLT) && !defined(LIBXSLT_STATIC) +- #define XSLTPUBFUN __declspec(dllexport) +- #define XSLTPUBVAR __declspec(dllexport) ++ #define XSLTPUBFUN extern __declspec(dllexport) ++ #define XSLTPUBVAR extern __declspec(dllexport) + #else + #define XSLTPUBFUN + #if !defined(LIBXSLT_STATIC) diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index 1320051ab9..cf38cf6a74 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( libexslt-pkgconfig.patch fix-gcrypt-deps.patch skip-install-docs.patch + extern_export.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libxslt/vcpkg.json b/ports/libxslt/vcpkg.json index 8d63754719..d67f9d8565 100644 --- a/ports/libxslt/vcpkg.json +++ b/ports/libxslt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxslt", "version": "1.1.35", - "port-version": 1, + "port-version": 2, "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 8ee198b389..14223112e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4278,7 +4278,7 @@ }, "libxslt": { "baseline": "1.1.35", - "port-version": 1 + "port-version": 2 }, "libyaml": { "baseline": "0.2.5", diff --git a/versions/l-/libxslt.json b/versions/l-/libxslt.json index 86b53c81b5..42335a998d 100644 --- a/versions/l-/libxslt.json +++ b/versions/l-/libxslt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb07abefc8894accd9967f41c8db983dcc031189", + "version": "1.1.35", + "port-version": 2 + }, { "git-tree": "3febc2931430356214f9a15ec06f7863ad4825d9", "version": "1.1.35",