diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-12-29 16:34:43 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-29 16:34:43 -0800 |
| commit | b12f78c3ed08ca7cddb17110a2bcdcf2cd5f889e (patch) | |
| tree | fe22d44a7c80df739366b78ee8da5256ba08c2d4 | |
| parent | 1e736c7eb4712037ba95cd93c48b81962914a50d (diff) | |
| download | vcpkg-b12f78c3ed08ca7cddb17110a2bcdcf2cd5f889e.tar.gz vcpkg-b12f78c3ed08ca7cddb17110a2bcdcf2cd5f889e.zip | |
[antlr4,python3] Resolve cross port conflicts (#15378)
* [python3] Add vcpkg's include directories to the end rather than to the beginning.
This is safe because vcpkg never hydrates python3's $(PySrcDir)\externals directory, so it wasn't using vendored dependencies at all.
* [antlr4] Install antlr headers in antlr4-runtime rather than the root to avoid stomping on common name token.h.
This is consistent with the ubuntu packages.
| -rw-r--r-- | ports/antlr4/CONTROL | 3 | ||||
| -rw-r--r-- | ports/antlr4/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/python3/python_vcpkg.props.in | 2 | ||||
| -rw-r--r-- | ports/python3/vcpkg.json | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/ports/antlr4/CONTROL b/ports/antlr4/CONTROL index 31614905a..e48354528 100644 --- a/ports/antlr4/CONTROL +++ b/ports/antlr4/CONTROL @@ -1,6 +1,7 @@ Source: antlr4 Version: 4.8 +Port-Version: 1 Homepage: https://www.antlr.org Description: ANother Tool for Language Recognition Build-Depends: libuuid (!uwp&!windows&!osx) -Supports: !uwp
\ No newline at end of file +Supports: !uwp diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake index 5160648f3..6ceaa3af9 100644 --- a/ports/antlr4/portfile.cmake +++ b/ports/antlr4/portfile.cmake @@ -78,12 +78,6 @@ else() endif()
endif()
-file(GLOB HDRS LIST_DIRECTORIES true ${CURRENT_PACKAGES_DIR}/include/antlr4-runtime/*)
-file(COPY ${HDRS} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/antlr4-runtime)
-
vcpkg_copy_pdbs()
file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
-message(STATUS "Installing done")
\ No newline at end of file diff --git a/ports/python3/python_vcpkg.props.in b/ports/python3/python_vcpkg.props.in index efad43bbd..c786e5fa0 100644 --- a/ports/python3/python_vcpkg.props.in +++ b/ports/python3/python_vcpkg.props.in @@ -6,7 +6,7 @@ <PreprocessorDefinitions>_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="${VCPKG_LIBRARY_LINKAGE} == 'static'">XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>
- ${CURRENT_INSTALLED_DIR}/include;%(AdditionalIncludeDirectories)
+ %(AdditionalIncludeDirectories);${CURRENT_INSTALLED_DIR}/include
</AdditionalIncludeDirectories>
<RuntimeLibrary Condition="'${VCPKG_CRT_LINKAGE}|$(Configuration)' == 'static|Debug'">MultiThreadedDebug</RuntimeLibrary>
diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 5907ab9b9..b8aa2ac3c 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version-string": "3.9.0", - "port-version": 1, + "port-version": 2, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "supports": "!(arm | uwp)", |