mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-15 01:29:18 +08:00
python3: disable tkinter module on posix (#34998)
When running with VCPKG_FORCE_SYSTEM_BINARIES=ON (linux/arm64) then the Python build will pick up libtk and attempt to build the tkinter module, linking to the system library and causing either a build failure or an external link dependency. Fix this by explicitly disabling it as we do for curses.
This commit is contained in:
parent
a241fec927
commit
8e745df694
@ -1,24 +0,0 @@
|
||||
From 08599a02debaa2ea015d1221dd2c8ca0481640a3 Mon Sep 17 00:00:00 2001
|
||||
From: Billy Robert O'Neal III <bion@microsoft.com>
|
||||
Date: Wed, 26 Apr 2023 05:17:09 +0000
|
||||
Subject: [PATCH 12/14] force disable curses
|
||||
|
||||
---
|
||||
Modules/Setup | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/Modules/Setup b/Modules/Setup
|
||||
index 87c6a152f8..7ad53f5b4f 100644
|
||||
--- a/Modules/Setup
|
||||
+++ b/Modules/Setup
|
||||
@@ -300,3 +300,7 @@ xxsubtype xxsubtype.c
|
||||
#
|
||||
# _sqlite3 _tkinter _curses pyexpat
|
||||
# _codecs_jp _codecs_kr _codecs_tw unicodedata
|
||||
+
|
||||
+*disabled*
|
||||
+_curses
|
||||
+_curses_panel
|
||||
--
|
||||
2.25.1
|
||||
|
13
ports/python3/0012-force-disable-modules.patch
Normal file
13
ports/python3/0012-force-disable-modules.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/Modules/Setup b/Modules/Setup
|
||||
index 87c6a152f8..7ad53f5b4f 100644
|
||||
--- a/Modules/Setup
|
||||
+++ b/Modules/Setup
|
||||
@@ -375,3 +375,8 @@ xxsubtype xxsubtype.c
|
||||
#
|
||||
# _sqlite3 _tkinter _curses pyexpat
|
||||
# _codecs_jp _codecs_kr _codecs_tw unicodedata
|
||||
+
|
||||
+*disabled*
|
||||
+_curses
|
||||
+_curses_panel
|
||||
+_tkinter
|
@ -15,7 +15,7 @@ set(PATCHES
|
||||
0005-dont-copy-vcruntime.patch
|
||||
0008-python.pc.patch
|
||||
0010-dont-skip-rpath.patch
|
||||
0012-force-disable-curses.patch
|
||||
0012-force-disable-modules.patch
|
||||
0014-fix-get-python-inc-output.patch
|
||||
0015-dont-use-WINDOWS-def.patch
|
||||
0018-fix-sysconfig-include.patch
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "python3",
|
||||
"version": "3.11.5",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "The Python programming language",
|
||||
"homepage": "https://github.com/python/cpython",
|
||||
"license": "Python-2.0",
|
||||
|
@ -6810,7 +6810,7 @@
|
||||
},
|
||||
"python3": {
|
||||
"baseline": "3.11.5",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"qca": {
|
||||
"baseline": "2.3.7",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "f51d67945e156a17ca72a743f04455a368e73272",
|
||||
"version": "3.11.5",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "a428056a4e0e86adce9344f051e4678e50e6cb35",
|
||||
"version": "3.11.5",
|
||||
|
Loading…
x
Reference in New Issue
Block a user