forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[rapidxml] Fix gcc and clang build issue (microsoft#43199)
- Loading branch information
1 parent
d320630
commit d4f3e12
Showing
5 changed files
with
60 additions
and
17 deletions.
There are no files selected for viewing
37 changes: 37 additions & 0 deletions
37
ports/rapidxml/0001-fix-for-a-bug-in-gcc-that-won-t-let-rapidxml-compile.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
From 2cf47bb8fb1de71bb2d2e059c15a30ffa4ca4cd6 Mon Sep 17 00:00:00 2001 | ||
From: Ferdinand Niedermann <ferdinand.niedermann@gmail.com> | ||
Date: Sat, 21 Sep 2013 01:55:58 +0200 | ||
Subject: [PATCH] fix for a bug in gcc that won't let rapidxml compile on clang | ||
|
||
--- | ||
rapidxml_print.hpp | 14 ++++++++++++++ | ||
1 file changed, 14 insertions(+) | ||
|
||
diff --git a/rapidxml_print.hpp b/rapidxml_print.hpp | ||
index d03d5f5..7ef305e 100755 | ||
--- a/rapidxml_print.hpp | ||
+++ b/rapidxml_print.hpp | ||
@@ -102,6 +102,20 @@ namespace rapidxml | ||
/////////////////////////////////////////////////////////////////////////// | ||
// Internal printing operations | ||
|
||
+ // ===================================== | ||
+ // fix for clang for this bug in gcc and others: http://sourceforge.net/p/rapidxml/bugs/16/ | ||
+ | ||
+ template<class OutIt, class Ch> inline OutIt print_children(OutIt out, const xml_node<Ch> *node, int flags, int indent); | ||
+ template<class OutIt, class Ch> inline OutIt print_element_node(OutIt out, const xml_node<Ch> *node, int flags, int indent); | ||
+ template<class OutIt, class Ch> inline OutIt print_data_node(OutIt out, const xml_node<Ch> *node, int flags, int indent); | ||
+ template<class OutIt, class Ch> inline OutIt print_cdata_node(OutIt out, const xml_node<Ch> *node, int flags, int indent); | ||
+ template<class OutIt, class Ch> inline OutIt print_declaration_node(OutIt out, const xml_node<Ch> *node, int flags, int indent); | ||
+ template<class OutIt, class Ch> inline OutIt print_comment_node(OutIt out, const xml_node<Ch> *node, int flags, int indent); | ||
+ template<class OutIt, class Ch> inline OutIt print_doctype_node(OutIt out, const xml_node<Ch> *node, int flags, int indent); | ||
+ template<class OutIt, class Ch> inline OutIt print_pi_node(OutIt out, const xml_node<Ch> *node, int flags, int indent); | ||
+ | ||
+ // ===================================== | ||
+ | ||
// Print node | ||
template<class OutIt, class Ch> | ||
inline OutIt print_node(OutIt out, const xml_node<Ch> *node, int flags, int indent) | ||
-- | ||
1.8.4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,16 @@ | ||
#header-only library | ||
vcpkg_from_sourceforge( | ||
OUT_SOURCE_PATH SOURCE_PATH | ||
REPO rapidxml/rapidxml | ||
REF rapidxml%201.13 | ||
FILENAME "rapidxml-1.13.zip" | ||
SHA512 6c10583e6631ccdb0217d0a5381172cb4c1046226de6ef1acf398d85e81d145228e14c3016aefcd7b70a1db8631505b048d8b4f5d4b0dbf1811d2482eefdd265 | ||
) | ||
|
||
# Handle copyright | ||
file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rapidxml) | ||
file(RENAME ${CURRENT_PACKAGES_DIR}/share/rapidxml/license.txt ${CURRENT_PACKAGES_DIR}/share/rapidxml/copyright) | ||
|
||
# Copy the header files | ||
file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/rapidxml FILES_MATCHING PATTERN "*.hpp") | ||
#header-only library | ||
vcpkg_from_sourceforge( | ||
OUT_SOURCE_PATH SOURCE_PATH | ||
REPO rapidxml/rapidxml | ||
REF rapidxml%20${VERSION} | ||
FILENAME "rapidxml-${VERSION}.zip" | ||
SHA512 6c10583e6631ccdb0217d0a5381172cb4c1046226de6ef1acf398d85e81d145228e14c3016aefcd7b70a1db8631505b048d8b4f5d4b0dbf1811d2482eefdd265 | ||
PATCHES | ||
0001-fix-for-a-bug-in-gcc-that-won-t-let-rapidxml-compile.patch # https://sourceforge.net/p/rapidxml/bugs/16/ | ||
) | ||
|
||
# Handle copyright | ||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt") | ||
|
||
# Copy the header files | ||
file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/rapidxml FILES_MATCHING PATTERN "*.hpp") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{ | ||
"name": "rapidxml", | ||
"version": "1.13", | ||
"port-version": 6, | ||
"port-version": 7, | ||
"description": "RapidXml is an attempt to create the fastest XML parser possible, while retaining useability, portability and reasonable W3C compatibility.", | ||
"homepage": "https://sourceforge.net/projects/rapidxml" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters