diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-12-06 02:18:47 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-06 02:18:47 -0800 |
| commit | 92dc30ff52fae0d7236b5b3dd7e6b2f0ff39ae6f (patch) | |
| tree | 5ae6a8b492a2a103bb1a9280ccc96d825d0b090b /ports | |
| parent | 3f11755f2a295517874cfc367b3c9088f4d29d07 (diff) | |
| download | vcpkg-92dc30ff52fae0d7236b5b3dd7e6b2f0ff39ae6f.tar.gz vcpkg-92dc30ff52fae0d7236b5b3dd7e6b2f0ff39ae6f.zip | |
[vcpkg] Check in baseline results for CI builds (#9203)
* [vcpkg] Check in initial baseline
* [vcpkg] Baseline update
* [vcpkg] Further baseline updates
* [vcpkg] Update baseline
* [vcpkg] Update baseline
* [vcpkg] Update baseline
* [vcpkg] Update baseline
* [xalan-c] Fix flaky build for non-Windows hosts
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/xalan-c/CONTROL | 2 | ||||
| -rw-r--r-- | ports/xalan-c/fix-linux-no-bin.patch | 20 | ||||
| -rw-r--r-- | ports/xalan-c/portfile.cmake | 1 |
3 files changed, 22 insertions, 1 deletions
diff --git a/ports/xalan-c/CONTROL b/ports/xalan-c/CONTROL index b87743cc3..b9e3d8584 100644 --- a/ports/xalan-c/CONTROL +++ b/ports/xalan-c/CONTROL @@ -1,5 +1,5 @@ Source: xalan-c -Version: 1.11-9 +Version: 1.11-10 Homepage: https://github.com/apache/xalan-c Description: Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types Build-Depends: xerces-c diff --git a/ports/xalan-c/fix-linux-no-bin.patch b/ports/xalan-c/fix-linux-no-bin.patch new file mode 100644 index 000000000..3d468a1c5 --- /dev/null +++ b/ports/xalan-c/fix-linux-no-bin.patch @@ -0,0 +1,20 @@ +diff --git a/src/xalanc/Utils/CMakeLists.txt b/src/xalanc/Utils/CMakeLists.txt +index 2d78685..72b611b 100644 +--- a/src/xalanc/Utils/CMakeLists.txt ++++ b/src/xalanc/Utils/CMakeLists.txt +@@ -41,11 +41,15 @@ add_custom_target(locale ALL) + set_target_properties(locale PROPERTIES FOLDER "Message Library") + + # workaround for case of missing xerces-c dll ++if(CMAKE_HOST_WIN32) + if(EXISTS ${XercesC_INCLUDE_DIR}/../bin) + set(MsgCreator_WD $<TARGET_FILE_DIR:XercesC::XercesC>/../bin) + else() + set(MsgCreator_WD "${XSL_NLS_GEN_DIR}") + endif() ++else() ++ set(MsgCreator_WD "${PROJECT_BINARY_DIR}") ++endif() + + if(msgloader STREQUAL "inmemory") + add_custom_command( diff --git a/ports/xalan-c/portfile.cmake b/ports/xalan-c/portfile.cmake index 0771f0783..a40d9a068 100644 --- a/ports/xalan-c/portfile.cmake +++ b/ports/xalan-c/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( PATCHES fix-win-deprecated-err.patch fix-missing-dll-error.patch + fix-linux-no-bin.patch ) vcpkg_configure_cmake( |