diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-05-22 02:39:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-21 11:39:48 -0700 |
| commit | 4c1db6840fa7661cf2adb27fa56e4bd0c6f022ea (patch) | |
| tree | 715e25be133b1e6d5d6984678002e69f3332ccaa | |
| parent | cbe795f7888861167f9e930397fed97158d1f7dc (diff) | |
| download | vcpkg-4c1db6840fa7661cf2adb27fa56e4bd0c6f022ea.tar.gz vcpkg-4c1db6840fa7661cf2adb27fa56e4bd0c6f022ea.zip | |
[python3] Fix dynamic build error on Linux (#11489)
* [python3] Fix dynamic build error on Linux
* Update baseline to resolve the regression
| -rw-r--r-- | ports/python3/CONTROL | 3 | ||||
| -rw-r--r-- | ports/python3/portfile.cmake | 3 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/ports/python3/CONTROL b/ports/python3/CONTROL index 602c42355..3c6ba8eb1 100644 --- a/ports/python3/CONTROL +++ b/ports/python3/CONTROL @@ -1,8 +1,9 @@ Source: python3 -Version: 3.7.3-2 +Version: 3.7.3-3 Homepage: https://github.com/python/cpython Description: The Python programming language as an embeddable library Build-Depends: libffi, openssl Feature: enable-shared Description: Build shared libraries in addition to static ones built by default +Build-Depends: zlib (!uwp&!windows) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 44fe20fd2..807b549d1 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -18,6 +18,9 @@ vcpkg_from_github( if("enable-shared" IN_LIST FEATURES) set(_ENABLED_SHARED --enable-shared) + if(VCPKG_TARGET_IS_LINUX) + message(WARNING"Feature enable-shared requires libffi-devel from the system package manager, please install it on Ubuntu system via sudo apt-get install libffi-dev.") + endif() else() unset(_ENABLED_SHARED) endif() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f4400b211..214b3007c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1092,6 +1092,10 @@ miniupnpc:arm-uwp=fail miniupnpc:x64-uwp=fail
minizip:arm-uwp=fail
minizip:x64-uwp=fail
+# conflicts with stb
+mlpack:x86-windows=skip
+mlpack:x64-windows=skip
+mlpack:x64-windows-static=skip
mman:x64-linux=fail
mman:x64-osx=fail
mmloader:arm64-windows=fail
|