diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-06-21 05:44:03 +0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-06-20 14:44:03 -0700 |
| commit | 321540a82abec73f280847df10af6aa1fe9e472b (patch) | |
| tree | 1743667d382dc4bb9a24f745d2ce2d46cf345193 | |
| parent | 83520dbc36e644951829f1a94fe47395314d9a4c (diff) | |
| download | vcpkg-321540a82abec73f280847df10af6aa1fe9e472b.tar.gz vcpkg-321540a82abec73f280847df10af6aa1fe9e472b.zip | |
[xerces-c]Replace the macro DLL_EXPORT with the macro XERCES_DLL_EXPORT (#6970)
* [xerces-c]Disable defining DLL_EXPORT to avoid affecting other ports
* [xerces-c]Replace the macro DLL_EXPORT with the macro XERCES_DLL_EXPORT
| -rw-r--r-- | ports/xerces-c/CONTROL | 2 | ||||
| -rw-r--r-- | ports/xerces-c/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/xerces-c/remove-dll-export-macro.patch | 27 |
3 files changed, 31 insertions, 2 deletions
diff --git a/ports/xerces-c/CONTROL b/ports/xerces-c/CONTROL index 2fde766e1..3d2a4337e 100644 --- a/ports/xerces-c/CONTROL +++ b/ports/xerces-c/CONTROL @@ -1,5 +1,5 @@ Source: xerces-c -Version: 3.2.2-9 +Version: 3.2.2-10 Homepage: https://github.com/apache/xerces-c Description: Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs. diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake index ad3c6d79e..5f8fa4c11 100644 --- a/ports/xerces-c/portfile.cmake +++ b/ports/xerces-c/portfile.cmake @@ -6,7 +6,9 @@ vcpkg_from_github( REF Xerces-C_3_2_2 SHA512 66f60fe9194376ac0ca99d13ea5bce23ada86e0261dde30686c21ceb5499e754dab8eb0a98adadd83522bda62709377715501f6dac49763e3a686f9171cc63ea HEAD_REF trunk - PATCHES disable-tests.patch + PATCHES + disable-tests.patch + remove-dll-export-macro.patch ) set(DISABLE_ICU ON) diff --git a/ports/xerces-c/remove-dll-export-macro.patch b/ports/xerces-c/remove-dll-export-macro.patch new file mode 100644 index 000000000..f6f0e6975 --- /dev/null +++ b/ports/xerces-c/remove-dll-export-macro.patch @@ -0,0 +1,27 @@ +diff --git a/src/xercesc/util/XercesDefs.hpp b/src/xercesc/util/XercesDefs.hpp +index 8071260..cd6bd68 100644 +--- a/src/xercesc/util/XercesDefs.hpp ++++ b/src/xercesc/util/XercesDefs.hpp +@@ -133,7 +133,7 @@ typedef XMLUInt32 UCS4Ch; + // The DLL_EXPORT flag should be defined on the command line during the build of a DLL + // configure conspires to make this happen. + +-#if defined(DLL_EXPORT) ++#if defined(XERCES_DLL_EXPORT) + #if defined(XERCES_BUILDING_LIBRARY) + #define XMLUTIL_EXPORT XERCES_PLATFORM_EXPORT + #define XMLPARSER_EXPORT XERCES_PLATFORM_EXPORT +diff --git a/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in b/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in +index e849e08..69fe3bf 100644 +--- a/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in ++++ b/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in +@@ -85,9 +85,6 @@ + #define XERCES_PLATFORM_EXPORT @XERCES_PLATFORM_EXPORT@ + #define XERCES_PLATFORM_IMPORT @XERCES_PLATFORM_IMPORT@ + #define XERCES_TEMPLATE_EXTERN @XERCES_TEMPLATE_EXTERN@ +-#ifdef XERCES_DLL_EXPORT +-# define DLL_EXPORT +-#endif + + // --------------------------------------------------------------------------- + // Include standard headers, if available, that we may rely on below. |