Date: Thu, 15 Dec 2022 17:31:59 GMT
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: 62723bbe6070 - main - Revert "*/py-{gdbm,sqlite3,tkinter}: switch from distutils to setuptools"
Message-ID: <202212151731.2BFHVxIu011923@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=62723bbe60705c70cf2dceb23a22a73bdd4d4ae3 commit 62723bbe60705c70cf2dceb23a22a73bdd4d4ae3 Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2022-12-15 17:29:27 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2022-12-15 17:31:40 +0000 Revert "*/py-{gdbm,sqlite3,tkinter}: switch from distutils to setuptools" This reverts commit 7446740638e7d833fde0962e71ef440a6af3c749. The change is not valid as setuptools have deprecated setup.py, while distutils will be supported in existing point releases. Python 3.12 support will require different solution. PR: 268283 --- databases/py-gdbm/files/setup3.py | 12 +++++------- databases/py-sqlite3/files/setup3.py | 13 ++++++------- x11-toolkits/py-tkinter/files/setup3.py | 12 ++++++------ 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/databases/py-gdbm/files/setup3.py b/databases/py-gdbm/files/setup3.py index 26df5565cfd3..0a947466d03e 100644 --- a/databases/py-gdbm/files/setup3.py +++ b/databases/py-gdbm/files/setup3.py @@ -3,19 +3,17 @@ # python setup.py install # -import os -import sys - try: - import setuptools - from setuptools.command.install import install - from setuptools import setup, Extension + import distutils + from distutils import sysconfig + from distutils.command.install import install + from distutils.core import setup, Extension except: raise SystemExit("Distutils problem") install.sub_commands = [x for x in install.sub_commands if 'egg' not in x[0]] -prefix = os.path.normpath(sys.prefix) +prefix = sysconfig.PREFIX inc_dirs = [prefix + "/include"] lib_dirs = [prefix + "/lib"] libs = ["gdbm"] diff --git a/databases/py-sqlite3/files/setup3.py b/databases/py-sqlite3/files/setup3.py index 1a763dd8cb71..944c89920852 100644 --- a/databases/py-sqlite3/files/setup3.py +++ b/databases/py-sqlite3/files/setup3.py @@ -3,20 +3,19 @@ # python setup.py install # -import os import platform -import sys try: - import setuptools - from setuptools.command.install import install - from setuptools import setup, Extension + import distutils + from distutils import sysconfig + from distutils.command.install import install + from distutils.core import setup, Extension except: - raise SystemExit("Setuptools problem") + raise SystemExit("Distutils problem") install.sub_commands = [x for x in install.sub_commands if 'egg' not in x[0]] -prefix = os.path.normpath(sys.prefix) +prefix = sysconfig.PREFIX inc_dirs = [prefix + "/include", "Modules/_sqlite"] lib_dirs = [prefix + "/lib"] libs = ["sqlite3"] diff --git a/x11-toolkits/py-tkinter/files/setup3.py b/x11-toolkits/py-tkinter/files/setup3.py index d0a7fc30c0bf..bcf53d093857 100644 --- a/x11-toolkits/py-tkinter/files/setup3.py +++ b/x11-toolkits/py-tkinter/files/setup3.py @@ -3,20 +3,20 @@ # python setup.py install # -import os -import sys +import os, string try: - import setuptools - from setuptools.command.install import install - from setuptools import setup, Extension + import distutils + from distutils import sysconfig + from distutils.command.install import install + from distutils.core import setup, Extension except: raise SystemExit("Distutils problem") install.sub_commands = [x for x in install.sub_commands if 'egg' not in x[0]] tkversion = "%%TK_VER%%" -prefix = os.path.normpath(sys.prefix) +prefix = sysconfig.PREFIX # Python 1.5 doesn't have os.getenv()? x11base = os.environ['LOCALBASE'] or '/usr/X11R6' inc_dirs = [prefix + "/include",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212151731.2BFHVxIu011923>