public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] Specify python2 or python3 as Python program name
@ 2016-05-11 21:54 Jim Chen
  2016-05-11 21:54 ` [PATCH] [GDBServer] Send SIGINT using process group ID Jim Chen
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Jim Chen @ 2016-05-11 21:54 UTC (permalink / raw)
  To: gdb-patches; +Cc: Jim Chen

Hi,

When initializing Python, GDB hard codes the Python program name to
$prefix/bin/python, where $prefix is /usr for example. On some
platforms, /usr/bin/python points to python3. So what happens is, even
if GDB is built with python2 support, GDB ends up setting the Python
program name to point to python3, causing a mismatch. I think it's
better to deliberately specify python2 or python3.

Patch tested on x86_64-linux.

gdb:

2016-05-05  Jim Chen <nchen@mozilla.com>

	* python/python.c (_initialize_python): Specify python2 or python3
	when initializing the Python program name.
---
 gdb/python/python.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gdb/python/python.c b/gdb/python/python.c
index c706644..4e80951 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -1701,17 +1701,23 @@ message == an error message without a stack will be printed."),
 #ifdef WITH_PYTHON_PATH
   /* Work around problem where python gets confused about where it is,
      and then can't find its libraries, etc.
      NOTE: Python assumes the following layout:
      /foo/bin/python
      /foo/lib/pythonX.Y/...
      This must be done before calling Py_Initialize.  */
   progname = concat (ldirname (python_libdir), SLASH_STRING, "bin",
-		     SLASH_STRING, "python", (char *) NULL);
+		     SLASH_STRING,
+#ifdef IS_PY3K
+		     "python3",
+#else
+		     "python2",
+#endif
+		     (char *) NULL);
 #ifdef IS_PY3K
   oldloc = xstrdup (setlocale (LC_ALL, NULL));
   setlocale (LC_ALL, "");
   progsize = strlen (progname);
   progname_copy = (wchar_t *) PyMem_Malloc ((progsize + 1) * sizeof (wchar_t));
   if (!progname_copy)
     {
       xfree (oldloc);
-- 
2.7.3

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-05-19 16:01 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-11 21:54 [PATCH] Specify python2 or python3 as Python program name Jim Chen
2016-05-11 21:54 ` [PATCH] [GDBServer] Send SIGINT using process group ID Jim Chen
2016-05-18 12:10   ` Pedro Alves
2016-05-19 16:01     ` Jim Chen
2016-05-12  5:54 ` [PATCH] Specify python2 or python3 as Python program name Eli Zaretskii
2016-05-12 12:50 ` Yao Qi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).