mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 19:19:01 +08:00
[vcpkg baseline][pocketpy] Don't install include/pybind11/* (#39571)
Detected by https://dev.azure.com/vcpkg/public/_build/results?buildId=104413&view=results ``` error: The following files are already installed in /mnt/vcpkg-ci/installed/x64-linux and are in conflict with pocketpy:x64-linux Installed by pybind11:x64-linux include/pybind11/embed.h include/pybind11/functional.h include/pybind11/operators.h include/pybind11/pybind11.h include/pybind11/stl.h ``` Broken by https://github.com/microsoft/vcpkg/pull/39510, in which pybind11 support was added.
This commit is contained in:
parent
db0f4e665e
commit
547252439a
14
ports/pocketpy/fix-conflict.patch
Normal file
14
ports/pocketpy/fix-conflict.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ed02678..9297b20 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -86,7 +86,8 @@ if (PK_INSTALL)
|
||||
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
|
||||
DESTINATION include
|
||||
FILES_MATCHING PATTERN "*.h"
|
||||
- PATTERN "typings" EXCLUDE
|
||||
+ PATTERN "typings" EXCLUDE
|
||||
+ PATTERN "pybind11" EXCLUDE
|
||||
)
|
||||
|
||||
# generate config.cmake
|
@ -4,6 +4,8 @@ vcpkg_from_github(
|
||||
REF "v${VERSION}"
|
||||
SHA512 6c9872c4a402bc702e577067c05d593034f45f150ebbf033ef204b4c7deff6cd2da0f9db44e0bb37aefdeb7a4d99e5a9c4a93ece57316f561c5bf4cd33cd12e3
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-conflict.patch
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "pocketpy",
|
||||
"version": "1.4.6",
|
||||
"port-version": 1,
|
||||
"description": "pkpy is a lightweight(~15K LOC) Python interpreter for game scripting, built on C++17 with STL.",
|
||||
"homepage": "https://github.com/pocketpy/pocketpy",
|
||||
"license": "MIT",
|
||||
|
@ -6922,7 +6922,7 @@
|
||||
},
|
||||
"pocketpy": {
|
||||
"baseline": "1.4.6",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"poco": {
|
||||
"baseline": "1.13.3",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "822ad9d667f6fbfd6b8db0ce4995f1228cfdb53f",
|
||||
"version": "1.4.6",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "ddb905f0cbb265ebd49458d25e24c666f911fe22",
|
||||
"version": "1.4.6",
|
||||
|
Loading…
Reference in New Issue
Block a user