split patches for python version

Author: jjhelmus

cpython-unix/build-cpython.sh

@@ -640,7 +640,12 @@ fi
 # determine executable_dir when valid. This allows venv to be created from symlinks and covers some
 # cases the above patch doesn't. See:
 # https://github.com/python/cpython/issues/106045#issuecomment-2594628161
-patch -p1 -i "${ROOT}/patch-getpath-use-base_executable-for-executable_dir.patch"
+# 3.10 does not use getpath.py only getpath.c, no patch is applied
+if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_14}" ]; then
+    patch -p1 -i "${ROOT}/patch-getpath-use-base_executable-for-executable_dir-314.patch"
+elif [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_11}" ]; then
+    patch -p1 -i "${ROOT}/patch-getpath-use-base_executable-for-executable_dir.patch"
+fi
 
 # We patched configure.ac above. Reflect those changes.
 autoconf

cpython-unix/patch-getpath-use-base_executable-for-executable_dir-314.patch

@@ -0,0 +1,14 @@
+diff --git a/Modules/getpath.py b/Modules/getpath.py
+index ceb605a75c8..164d708ffca 100644
+--- a/Modules/getpath.py
++++ b/Modules/getpath.py
+@@ -411,6 +411,9 @@ def search_up(prefix, *landmarks, test=isfile):
+                             if isfile(candidate):
+                                 base_executable = candidate
+                                 break
++                if base_executable and isfile(base_executable):
++                    # Update the executable directory to be based on the resolved base executable
++                    executable_dir = real_executable_dir = dirname(base_executable)
+             # home key found; stop iterating over lines
+             break
+ 

cpython-unix/patch-getpath-use-base_executable-for-executable_dir.patch

@@ -1,14 +1,15 @@
 diff --git a/Modules/getpath.py b/Modules/getpath.py
-index ceb605a75c8..164d708ffca 100644
+index 1f1bfcb4f64..ff5b18cc385 100644
 --- a/Modules/getpath.py
 +++ b/Modules/getpath.py
-@@ -411,6 +411,9 @@ def search_up(prefix, *landmarks, test=isfile):
+@@ -398,6 +398,9 @@ def search_up(prefix, *landmarks, test=isfile):
                              if isfile(candidate):
                                  base_executable = candidate
                                  break
 +                if base_executable and isfile(base_executable):
 +                    # Update the executable directory to be based on the resolved base executable
 +                    executable_dir = real_executable_dir = dirname(base_executable)
-             # home key found; stop iterating over lines
              break
- 
+     else:
+         venv_prefix = None
+