public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
From: Lancelot SIX <lsix@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] gdb/python-config: replace deprecated distutils.sysconfig
Date: Thu,  1 Sep 2022 09:01:13 +0000 (GMT)	[thread overview]
Message-ID: <20220901090113.12554382DB1E@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=be2057b902e834bba6fe7d3ded16177ec5624f3b

commit be2057b902e834bba6fe7d3ded16177ec5624f3b
Author: Lancelot SIX <lancelot.six@amd.com>
Date:   Fri Aug 26 08:39:03 2022 +0000

    gdb/python-config: replace deprecated distutils.sysconfig
    
    When running the gdb/configure script on ubuntu 22.04 with
    python-3.10.4, I see:
    
        checking for python... no
        checking for python3... /usr/bin/python3
        [...]/gdb/python/python-config.py:7: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives
          from distutils import sysconfig
        [...]/gdb/python/python-config.py:7: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead
          from distutils import sysconfig
        [...]/gdb/python/python-config.py:7: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives
          from distutils import sysconfig
        [...]/gdb/python/python-config.py:7: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead
          from distutils import sysconfig
        [...]/gdb/python/python-config.py:7: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives
          from distutils import sysconfig
        [...]/gdb/python/python-config.py:7: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead
          from distutils import sysconfig
        checking for python... yes
    
    The distutils module is deprecated as per the PEP 632[1] and will be
    removed in python-3.12.
    
    This patch migrates gdb/python/python-config.py from distutils.sysconfig
    to the sysconfig module[2].
    
    The sysconfig module has has been introduced in the standard library in
    python 3.2.  Given that support for python < 3.2 has been removed by
    edae3fd6600f: "gdb/python: remove Python 2 support", this patch does not
    need to support both implementations for backward compatibility.
    
    Tested on ubuntu-22.04 and ubuntu 20.04.
    
    [1] https://peps.python.org/pep-0632/
    [2] https://docs.python.org/3/library/sysconfig.html
    
    Change-Id: Id0df2baf3ee6ce68bd01c236b829ab4c0a4526f6

Diff:
---
 gdb/python/python-config.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gdb/python/python-config.py b/gdb/python/python-config.py
index 027d80dcc86..e89e0fd40bb 100644
--- a/gdb/python/python-config.py
+++ b/gdb/python/python-config.py
@@ -4,7 +4,7 @@
 import sys
 import os
 import getopt
-from distutils import sysconfig
+import sysconfig
 
 valid_opts = ["prefix", "exec-prefix", "includes", "libs", "cflags", "ldflags", "help"]
 
@@ -49,15 +49,15 @@ def to_unix_path(path):
 
 for opt in opt_flags:
     if opt == "--prefix":
-        print(to_unix_path(sysconfig.PREFIX))
+        print(to_unix_path(os.path.normpath(sys.prefix)))
 
     elif opt == "--exec-prefix":
-        print(to_unix_path(sysconfig.EXEC_PREFIX))
+        print(to_unix_path(os.path.normpath(sys.exec_prefix)))
 
     elif opt in ("--includes", "--cflags"):
         flags = [
-            "-I" + sysconfig.get_python_inc(),
-            "-I" + sysconfig.get_python_inc(plat_specific=True),
+            "-I" + sysconfig.get_path("include"),
+            "-I" + sysconfig.get_path("platinclude"),
         ]
         if opt == "--cflags":
             flags.extend(getvar("CFLAGS").split())
@@ -76,7 +76,7 @@ for opt in opt_flags:
                 if getvar("LIBPL") is not None:
                     libs.insert(0, "-L" + getvar("LIBPL"))
                 elif os.name == "nt":
-                    libs.insert(0, "-L" + sysconfig.PREFIX + "/libs")
+                    libs.insert(0, "-L" + os.path.normpath(sys.prefix) + "/libs")
             if getvar("LINKFORSHARED") is not None:
                 libs.extend(getvar("LINKFORSHARED").split())
         print(to_unix_path(" ".join(libs)))

                 reply	other threads:[~2022-09-01  9:01 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220901090113.12554382DB1E@sourceware.org \
    --to=lsix@sourceware.org \
    --cc=gdb-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).