From 867cda8ee8d60b8d2b63ec2947451a7b09276cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@riseup.net>
Date: Wed, 8 Jan 2025 19:53:27 +0000
Subject: [PATCH 1/7] GH-128469: warn when libpython was loaded from outside
 the build directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filipe Laíns <lains@riseup.net
---
 Modules/getpath.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Modules/getpath.py b/Modules/getpath.py
index c34101e720851d..673b04fa712041 100644
--- a/Modules/getpath.py
+++ b/Modules/getpath.py
@@ -783,6 +783,19 @@ def search_up(prefix, *landmarks, test=isfile):
     base_exec_prefix = config.get('base_exec_prefix') or EXEC_PREFIX or base_prefix
 
 
+# ******************************************************************************
+# MISC. RUNTIME WARNINGS
+# ******************************************************************************
+
+# When running Python from the build directory, if libpython is dynamically
+# linked, the wrong library might be loaded.
+if build_prefix and not build_prefix.startswith(dirname(abspath(library))):
+    msg = f'The runtime library has been loaded from outside the build directory ({library})!'
+    if os_name == 'posix':
+        msg += ' Consider setting LD_LIBRARY_PATH=. to force it to be loaded from the build directory.'
+    warn(msg)
+
+
 # ******************************************************************************
 # SET pythonpath FROM _PTH FILE
 # ******************************************************************************

From 29db6f00e60d6f2dd9a44e6fde4e8af18c139ed0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns=20=F0=9F=87=B5=F0=9F=87=B8?=
 <filipe.lains@gmail.com>
Date: Sat, 11 Jan 2025 01:13:04 +0000
Subject: [PATCH 2/7] Update Modules/getpath.py

Co-authored-by: Peter Bierma <zintensitydev@gmail.com>
---
 Modules/getpath.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/getpath.py b/Modules/getpath.py
index 673b04fa712041..a8f3b7565123bd 100644
--- a/Modules/getpath.py
+++ b/Modules/getpath.py
@@ -789,7 +789,7 @@ def search_up(prefix, *landmarks, test=isfile):
 
 # When running Python from the build directory, if libpython is dynamically
 # linked, the wrong library might be loaded.
-if build_prefix and not build_prefix.startswith(dirname(abspath(library))):
+if build_prefix and library and not build_prefix.startswith(dirname(abspath(library))):
     msg = f'The runtime library has been loaded from outside the build directory ({library})!'
     if os_name == 'posix':
         msg += ' Consider setting LD_LIBRARY_PATH=. to force it to be loaded from the build directory.'

From bf40c1703f8756dbb6c8dad8c9e684aadc8e7b9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@riseup.net>
Date: Sat, 11 Jan 2025 03:44:15 +0000
Subject: [PATCH 3/7] Fix check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filipe Laíns <lains@riseup.net
---
 Modules/getpath.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/getpath.py b/Modules/getpath.py
index a8f3b7565123bd..61e7c144dcbcd1 100644
--- a/Modules/getpath.py
+++ b/Modules/getpath.py
@@ -789,7 +789,7 @@ def search_up(prefix, *landmarks, test=isfile):
 
 # When running Python from the build directory, if libpython is dynamically
 # linked, the wrong library might be loaded.
-if build_prefix and library and not build_prefix.startswith(dirname(abspath(library))):
+if build_prefix and library and not dirname(abspath(library)).startswith(build_prefix):
     msg = f'The runtime library has been loaded from outside the build directory ({library})!'
     if os_name == 'posix':
         msg += ' Consider setting LD_LIBRARY_PATH=. to force it to be loaded from the build directory.'

From 7bb0e9f86bf18e4c49d1df00bcb8bff84809becc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@riseup.net>
Date: Sat, 11 Jan 2025 04:17:36 +0000
Subject: [PATCH 4/7] Add test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filipe Laíns <lains@riseup.net
---
 Lib/test/test_getpath.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/Lib/test/test_getpath.py b/Lib/test/test_getpath.py
index f86df9d0d03485..35d9f457894c57 100644
--- a/Lib/test/test_getpath.py
+++ b/Lib/test/test_getpath.py
@@ -1,7 +1,13 @@
 import copy
 import ntpath
+import os
 import pathlib
 import posixpath
+import shutil
+import subprocess
+import sys
+import sysconfig
+import tempfile
 import unittest
 
 from test.support import verbose
@@ -864,6 +870,30 @@ def test_PYTHONHOME_in_venv(self):
         actual = getpath(ns, expected)
         self.assertEqual(expected, actual)
 
+
+class RealGetPathTests(unittest.TestCase):
+    @unittest.skipUnless(
+        sysconfig.is_python_build(),
+        'Test only available when running from the buildir',
+    )
+    @unittest.skipUnless(os.name == 'posix', 'Test only support on POSIX')
+    def test_builddir_wrong_library_warning(self):
+        library_name = sysconfig.get_config_var('INSTSONAME')
+        with tempfile.TemporaryDirectory() as tmpdir:
+            shutil.copy2(
+                os.path.join(sysconfig.get_config_var('srcdir'), library_name),
+                os.path.join(tmpdir, library_name)
+            )
+            env = os.environ.copy()
+            env['LD_LIBRARY_PATH'] = tmpdir
+            process = subprocess.run(
+                [sys.executable, '-c', ''],
+                env=env, check=True, capture_output=True, text=True,
+            )
+        error_msg = 'The runtime library has been loaded from outside the build directory'
+        self.assertTrue(process.stderr.startswith(error_msg))
+
+
 # ******************************************************************************
 
 DEFAULT_NAMESPACE = dict(

From fe5e882eab844a708a25e37726787758bc589de0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@riseup.net>
Date: Sat, 11 Jan 2025 04:27:17 +0000
Subject: [PATCH 5/7] Fix test availability
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filipe Laíns <lains@riseup.net
---
 Lib/test/test_getpath.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_getpath.py b/Lib/test/test_getpath.py
index 35d9f457894c57..e575e3a69f4643 100644
--- a/Lib/test/test_getpath.py
+++ b/Lib/test/test_getpath.py
@@ -876,7 +876,10 @@ class RealGetPathTests(unittest.TestCase):
         sysconfig.is_python_build(),
         'Test only available when running from the buildir',
     )
-    @unittest.skipUnless(os.name == 'posix', 'Test only support on POSIX')
+    @unittest.skipUnless(
+        os.name == 'posix' and sys.platform != 'darwin',
+        'Test only support on Linux-like OS-es (support LD_LIBRARY_PATH)',
+    )
     def test_builddir_wrong_library_warning(self):
         library_name = sysconfig.get_config_var('INSTSONAME')
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -891,7 +894,7 @@ def test_builddir_wrong_library_warning(self):
                 env=env, check=True, capture_output=True, text=True,
             )
         error_msg = 'The runtime library has been loaded from outside the build directory'
-        self.assertTrue(process.stderr.startswith(error_msg))
+        self.assertTrue(process.stderr.startswith(error_msg), process.stderr)
 
 
 # ******************************************************************************

From 004f1937008d4f8ec59e7ae8145d68b0e5f571cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@riseup.net>
Date: Sat, 11 Jan 2025 04:31:22 +0000
Subject: [PATCH 6/7] Make test availability a bit stricter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filipe Laíns <lains@riseup.net
---
 Lib/test/test_getpath.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/test/test_getpath.py b/Lib/test/test_getpath.py
index e575e3a69f4643..e747e2b9c312f1 100644
--- a/Lib/test/test_getpath.py
+++ b/Lib/test/test_getpath.py
@@ -877,7 +877,7 @@ class RealGetPathTests(unittest.TestCase):
         'Test only available when running from the buildir',
     )
     @unittest.skipUnless(
-        os.name == 'posix' and sys.platform != 'darwin',
+        any(sys.platform.startswith(p) for p in ('linux', 'freebsd', 'centos')),
         'Test only support on Linux-like OS-es (support LD_LIBRARY_PATH)',
     )
     def test_builddir_wrong_library_warning(self):

From a8c9fa7a22dfa5b0402448d5583f64b16686f12e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@riseup.net>
Date: Wed, 29 Jan 2025 22:11:51 +0000
Subject: [PATCH 7/7] Fix test without --enable-dynamic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filipe Laíns <lains@riseup.net>
---
 Lib/test/test_getpath.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Lib/test/test_getpath.py b/Lib/test/test_getpath.py
index e747e2b9c312f1..ca7cee0c39872a 100644
--- a/Lib/test/test_getpath.py
+++ b/Lib/test/test_getpath.py
@@ -880,6 +880,10 @@ class RealGetPathTests(unittest.TestCase):
         any(sys.platform.startswith(p) for p in ('linux', 'freebsd', 'centos')),
         'Test only support on Linux-like OS-es (support LD_LIBRARY_PATH)',
     )
+    @unittest.skipUnless(
+        sysconfig.get_config_var('LDLIBRARY') != sysconfig.get_config_var('LIBRARY'),
+        'Test only available when using a dynamic libpython',
+    )
     def test_builddir_wrong_library_warning(self):
         library_name = sysconfig.get_config_var('INSTSONAME')
         with tempfile.TemporaryDirectory() as tmpdir: