From 1802d3943623b04c02ddb633255897cf66c0ef6f Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Mon, 6 Nov 2023 19:59:04 +0100
Subject: [PATCH] [python3] adjust sysconfig include dir to match vcpkg layout
 (#34888)

* [python3] modify sysconfig include dir for vcpkg layout

* v db
---
 .../python3/0018-fix-sysconfig-include.patch  | 27 +++++++++++++++++++
 ports/python3/portfile.cmake                  |  1 +
 ports/python3/vcpkg.json                      |  1 +
 versions/baseline.json                        |  2 +-
 versions/p-/python3.json                      |  5 ++++
 5 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 ports/python3/0018-fix-sysconfig-include.patch

diff --git a/ports/python3/0018-fix-sysconfig-include.patch b/ports/python3/0018-fix-sysconfig-include.patch
new file mode 100644
index 0000000000..56f3406ab5
--- /dev/null
+++ b/ports/python3/0018-fix-sysconfig-include.patch
@@ -0,0 +1,27 @@
+diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
+index ebe371182..e351df7da 100644
+--- a/Lib/sysconfig.py
++++ b/Lib/sysconfig.py
+@@ -30,9 +30,9 @@
+         'purelib': '{base}/lib/python{py_version_short}/site-packages',
+         'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages',
+         'include':
+-            '{installed_base}/include/python{py_version_short}{abiflags}',
++            '{installed_base}/../../include/python{py_version_short}{abiflags}',
+         'platinclude':
+-            '{installed_platbase}/include/python{py_version_short}{abiflags}',
++            '{installed_platbase}/../../include/python{py_version_short}{abiflags}',
+         'scripts': '{base}/bin',
+         'data': '{base}',
+         },
+@@ -51,8 +51,8 @@
+         'platstdlib': '{base}/Lib',
+         'purelib': '{base}/Lib/site-packages',
+         'platlib': '{base}/Lib/site-packages',
+-        'include': '{installed_base}/Include',
+-        'platinclude': '{installed_base}/Include',
++        'include': '{installed_base}/../../include/python{py_version_short}{abiflags}',
++        'platinclude': '{installed_base}/../../include/python{py_version_short}{abiflags}',
+         'scripts': '{base}/Scripts',
+         'data': '{base}',
+         },
diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake
index cb7472d42a..c7e23e7b61 100644
--- a/ports/python3/portfile.cmake
+++ b/ports/python3/portfile.cmake
@@ -18,6 +18,7 @@ set(PATCHES
     0012-force-disable-curses.patch
     0014-fix-get-python-inc-output.patch
     0015-dont-use-WINDOWS-def.patch
+    0018-fix-sysconfig-include.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json
index 3d0df6b231..ffe9e3cb15 100644
--- a/ports/python3/vcpkg.json
+++ b/ports/python3/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "python3",
   "version": "3.11.5",
+  "port-version": 1,
   "description": "The Python programming language",
   "homepage": "https://github.com/python/cpython",
   "license": "Python-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 66d15196ae..ac8cd4654f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6806,7 +6806,7 @@
     },
     "python3": {
       "baseline": "3.11.5",
-      "port-version": 0
+      "port-version": 1
     },
     "qca": {
       "baseline": "2.3.7",
diff --git a/versions/p-/python3.json b/versions/p-/python3.json
index fff69b431a..01105eabc4 100644
--- a/versions/p-/python3.json
+++ b/versions/p-/python3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a428056a4e0e86adce9344f051e4678e50e6cb35",
+      "version": "3.11.5",
+      "port-version": 1
+    },
     {
       "git-tree": "52f5c3a91d997108f5acebea1748176156dbefc9",
       "version": "3.11.5",