Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[xerces-c]Replace the macro DLL_EXPORT with the macro XERCES_DLL_EXPORT #6970

Merged
merged 2 commits into from
Jun 20, 2019
Merged

[xerces-c]Replace the macro DLL_EXPORT with the macro XERCES_DLL_EXPORT #6970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
925ca9e
[xerces-c]Disable defining DLL_EXPORT to avoid affecting other ports
Jun 20, 2019
ce4fc6d
[xerces-c]Replace the macro DLL_EXPORT with the macro XERCES_DLL_EXPORT
Jun 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/xerces-c/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
4 changes: 3 additions & 1 deletion ports/xerces-c/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
27 changes: 27 additions & 0 deletions ports/xerces-c/remove-dll-export-macro.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.