diff options
Diffstat (limited to 'source/d/python-setuptools')
| -rwxr-xr-x | source/d/python-setuptools/python-setuptools.SlackBuild | 24 | ||||
| -rw-r--r-- | source/d/python-setuptools/setuptools.x86_64.diff | 31 |
2 files changed, 0 insertions, 55 deletions
diff --git a/source/d/python-setuptools/python-setuptools.SlackBuild b/source/d/python-setuptools/python-setuptools.SlackBuild index 2e926666e..2c5b99d13 100755 --- a/source/d/python-setuptools/python-setuptools.SlackBuild +++ b/source/d/python-setuptools/python-setuptools.SlackBuild @@ -23,16 +23,6 @@ cd $(dirname $0) ; CWD=$(pwd) -# First, convert the .zip file if needed: -if ls *.zip 1> /dev/null 2> /dev/null ; then - unzip *.zip - tar cf $(basename *.zip .zip).tar $(basename *.zip .zip) - touch -r *.zip *.tar - plzip -9 *.tar - rm -r $(basename *.zip .zip) - rm *.zip -fi - PKGNAM=python-setuptools VERSION=${VERSION:-$(echo setuptools-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} @@ -88,20 +78,6 @@ find -L . \ rm -f setuptools/*.exe -# After Python 3.9, we will not mess with the upstream module layout again. -if python3 --version | grep -q "Python 3.9." ; then - # Recent Python versions support both a libdir (for pure Python modules) and a - # platlib (for $ARCH specific modules). We've always patched Python to use - # the platform directory (such as /usr/lib64/python3.9/site-packages on x86_64) - # for all modules. Perhaps we will rethink this, but since an installed - # setuptools now takes priority for reporting the libdir (and this no longer - # matches the platlib on architectures such as x86_64), let's patch setuptools - # to agree with Python: - if [ "$LIBDIRSUFFIX" = "64" ]; then - zcat $CWD/setuptools.x86_64.diff.gz | patch -p1 --verbose || exit 1 - fi -fi - # Sticking with setup.py while it exists to make it easier to bootstrap a # new Python version: python3 setup.py build install --root=$PKG || exit 1 diff --git a/source/d/python-setuptools/setuptools.x86_64.diff b/source/d/python-setuptools/setuptools.x86_64.diff deleted file mode 100644 index a9731d738..000000000 --- a/source/d/python-setuptools/setuptools.x86_64.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- ./setuptools/_distutils/sysconfig.py.orig 2022-08-21 02:05:13.000000000 -0500 -+++ ./setuptools/_distutils/sysconfig.py 2022-08-21 13:33:52.738969315 -0500 -@@ -234,7 +234,7 @@ - libdir = getattr(sys, "platlibdir", "lib") - else: - # Pure Python -- libdir = "lib" -+ libdir = "lib64" - implementation = 'pypy' if IS_PYPY else 'python' - libpython = os.path.join(prefix, libdir, implementation + get_python_version()) - return _posix_lib(standard_lib, libpython, early_prefix, prefix) ---- ./setuptools/_distutils/command/install.py.orig 2022-08-21 13:33:52.738969315 -0500 -+++ ./setuptools/_distutils/command/install.py 2022-08-21 13:35:11.919964935 -0500 -@@ -34,7 +34,7 @@ - - INSTALL_SCHEMES = { - 'posix_prefix': { -- 'purelib': '{base}/lib/{implementation_lower}{py_version_short}/site-packages', -+ 'purelib': '{base}/lib64/{implementation_lower}{py_version_short}/site-packages', - 'platlib': '{platbase}/{platlibdir}/{implementation_lower}' - '{py_version_short}/site-packages', - 'headers': '{base}/include/{implementation_lower}' -@@ -43,7 +43,7 @@ - 'data': '{base}', - }, - 'posix_home': { -- 'purelib': '{base}/lib/{implementation_lower}', -+ 'purelib': '{base}/lib64/{implementation_lower}', - 'platlib': '{base}/{platlibdir}/{implementation_lower}', - 'headers': '{base}/include/{implementation_lower}/{dist_name}', - 'scripts': '{base}/bin', |