mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
setuptools: bump version
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From f9d8bc1cfd0ad2d8aab4804af6bf7ccdc3363059 Mon Sep 17 00:00:00 2001
|
||||
From 2bfcd918a8fd0f8bc4ddb3ec7e17e26196233b78 Mon Sep 17 00:00:00 2001
|
||||
From: Oscar Lesta <oscar.lesta@gmail.com>
|
||||
Date: Wed, 11 Oct 2023 13:07:51 -0300
|
||||
Subject: Distutils patch for Haiku
|
||||
@@ -7,7 +7,7 @@ This is just the previous patch from Jerome Duval, but made to match
|
||||
the rest of the code's string substitution style on `command/install.py`.
|
||||
|
||||
diff --git a/setuptools/_distutils/command/install.py b/setuptools/_distutils/command/install.py
|
||||
index a7ac4e6..daf6d72 100644
|
||||
index dc17e56..9cc802a 100644
|
||||
--- a/setuptools/_distutils/command/install.py
|
||||
+++ b/setuptools/_distutils/command/install.py
|
||||
@@ -50,6 +50,33 @@ INSTALL_SCHEMES = {
|
||||
@@ -60,7 +60,7 @@ index a7ac4e6..daf6d72 100644
|
||||
INSTALL_SCHEMES.update(fw.schemes)
|
||||
|
||||
|
||||
@@ -554,10 +588,16 @@ class install(Command):
|
||||
@@ -548,10 +582,16 @@ class install(Command):
|
||||
if self.install_userbase is None:
|
||||
raise DistutilsPlatformError("User base directory is not specified")
|
||||
self.install_base = self.install_platbase = self.install_userbase
|
||||
@@ -79,7 +79,7 @@ index a7ac4e6..daf6d72 100644
|
||||
else:
|
||||
if self.prefix is None:
|
||||
if self.exec_prefix is not None:
|
||||
@@ -577,7 +617,13 @@ class install(Command):
|
||||
@@ -571,7 +611,13 @@ class install(Command):
|
||||
|
||||
self.install_base = self.prefix
|
||||
self.install_platbase = self.exec_prefix
|
||||
@@ -92,13 +92,13 @@ index a7ac4e6..daf6d72 100644
|
||||
+ else:
|
||||
+ self.select_scheme("posix_prefix")
|
||||
|
||||
def finalize_other(self):
|
||||
def finalize_other(self) -> None:
|
||||
"""Finalizes options for non-posix platforms"""
|
||||
diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py
|
||||
index a40a723..9bfa334 100644
|
||||
index 7ddc869..a47f227 100644
|
||||
--- a/setuptools/_distutils/sysconfig.py
|
||||
+++ b/setuptools/_distutils/sysconfig.py
|
||||
@@ -190,7 +190,8 @@ def _get_python_inc_from_config(plat_specific, spec_prefix):
|
||||
@@ -205,7 +205,8 @@ def _get_python_inc_from_config(plat_specific, spec_prefix):
|
||||
def _get_python_inc_posix_prefix(prefix):
|
||||
implementation = 'pypy' if IS_PYPY else 'python'
|
||||
python_dir = implementation + get_python_version() + build_flags
|
||||
@@ -108,11 +108,11 @@ index a40a723..9bfa334 100644
|
||||
|
||||
|
||||
def _get_python_inc_nt(prefix, spec_prefix, plat_specific):
|
||||
@@ -244,7 +245,14 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
|
||||
@@ -252,7 +253,14 @@ def get_python_lib(
|
||||
else:
|
||||
prefix = plat_specific and EXEC_PREFIX or PREFIX
|
||||
|
||||
- if os.name == "posix":
|
||||
- if os.name == "posix" or is_mingw():
|
||||
+ if os.name == "posix" and sys.platform.startswith('haiku'):
|
||||
+ if standard_lib:
|
||||
+ return os.path.join(prefix,
|
||||
@@ -120,10 +120,10 @@ index a40a723..9bfa334 100644
|
||||
+ return os.path.join(prefix, "non-packaged",
|
||||
+ "lib", "python" + get_python_version(),
|
||||
+ "site-packages")
|
||||
+ elif os.name == "posix":
|
||||
+ elif os.name == "posix" or is_mingw():
|
||||
if plat_specific or standard_lib:
|
||||
# Platform-specific modules (any module from a non-pure-Python
|
||||
# module distribution) or standard Python library modules.
|
||||
--
|
||||
2.42.0
|
||||
2.48.1
|
||||
|
||||
@@ -6,10 +6,10 @@ Perl and PHP, respectively."
|
||||
HOMEPAGE="https://pypi.python.org/pypi/setuptools"
|
||||
COPYRIGHT="2006-2013 Python Packaging Authority"
|
||||
LICENSE="MIT"
|
||||
REVISION="3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://files.pythonhosted.org/packages/source/s/setuptools/setuptools-$portVersion.tar.gz"
|
||||
SOURCE_FILENAME="setuptools-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87"
|
||||
CHECKSUM_SHA256="f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c"
|
||||
PATCHES="setuptools-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="any"
|
||||
Reference in New Issue
Block a user