diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2024-03-29 20:39:11 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2024-03-29 22:36:12 +0100 |
commit | 44183f6ba3935ea6dd56a2fad0394bc736e7461d (patch) | |
tree | bebc6b6629c62e080f7b140b6c233824ef0231ad /source/d | |
parent | 90b9714d2f62f8500252c7f3f5281c0e3777541e (diff) | |
download | current-44183f6ba3935ea6dd56a2fad0394bc736e7461d.tar.gz current-44183f6ba3935ea6dd56a2fad0394bc736e7461d.tar.xz |
Fri Mar 29 20:39:11 UTC 202420240329203911
Everything in this batch besides aaa_libraries, xz, mcelog, and harfbuzz is a
rebuild or upgrade to build against python-3.11.8. Looking at the python
readiness page, it seems like a lot of stuff we use is not certified for
python-3.12 yet (although to be fair, about half as much isn't certified for
python-3.11 either). But 3.11 seems to be the safer choice even though the
final bugfix update is scheduled for Monday. And, if we do decide to move
ahead to 3.12 later on, it'll be a lot easier than this update was.
Enjoy! :-)
a/aaa_libraries-15.1-x86_64-29.txz: Rebuilt.
Upgraded: libzstd.so.1.5.6, libexpat.so.1.9.2, libglib-2.0.so.0.8000.0,
libgmodule-2.0.so.0.8000.0, libgobject-2.0.so.0.8000.0,
libgthread-2.0.so.0.8000.0.
Removed: libboost_*.so.1.83.0.
a/libblockdev-2.28-x86_64-3.txz: Rebuilt.
a/libbytesize-2.8-x86_64-2.txz: Rebuilt.
a/libpwquality-1.4.5-x86_64-2.txz: Rebuilt.
a/mcelog-198-x86_64-1.txz: Upgraded.
a/util-linux-2.40-x86_64-2.txz: Rebuilt.
a/volume_key-0.3.12-x86_64-8.txz: Rebuilt.
a/xz-5.6.1-x86_64-2.txz: Rebuilt.
Seems like a good idea to build this from a git pull rather than the signed
release tarballs. :-)
The liblzma in the previous packages were not found to be vulnerable by the
detection script, but I'd rather not carry the bad m4 files in our sources.
Here's a test script for anyone wanting to try it:
if hexdump -ve '1/1 "%.2x"' /lib*/liblzma.so.5 | grep -q f30f1efa554889f54c89ce5389fb81e7000000804883ec28488954241848894c2410 ; then
echo probably vulnerable
else
echo probably not vulnerable
fi
ap/hplip-3.23.12-x86_64-3.txz: Rebuilt.
ap/linuxdoc-tools-0.9.82-x86_64-5.txz: Rebuilt.
ap/rpm-4.19.1.1-x86_64-2.txz: Rebuilt.
ap/undervolt-20210815_e39aea1-x86_64-3.txz: Rebuilt.
ap/vim-9.1.0225-x86_64-1.txz: Upgraded.
d/Cython-3.0.9-x86_64-2.txz: Rebuilt.
d/distcc-3.4-x86_64-5.txz: Rebuilt.
d/gdb-14.2-x86_64-2.txz: Rebuilt.
d/gyp-20210831_d6c5dd51-x86_64-3.txz: Rebuilt.
d/llvm-18.1.2-x86_64-2.txz: Rebuilt.
d/mercurial-6.7.1-x86_64-2.txz: Rebuilt.
d/meson-1.4.0-x86_64-2.txz: Rebuilt.
d/python-pip-24.0-x86_64-2.txz: Rebuilt.
d/python-setuptools-69.2.0-x86_64-2.txz: Rebuilt.
d/python3-3.11.8-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
d/scons-4.7.0-x86_64-2.txz: Rebuilt.
kde/cantor-23.08.5-x86_64-4.txz: Rebuilt.
kde/kapidox-5.115.0-x86_64-2.txz: Rebuilt.
kde/kdev-python-23.08.5-x86_64-2.txz: Rebuilt.
kde/kig-23.08.5-x86_64-2.txz: Rebuilt.
kde/kmymoney-5.1.3-x86_64-4.txz: Rebuilt.
kde/kopeninghours-23.08.5-x86_64-2.txz: Rebuilt.
kde/krita-5.2.2-x86_64-6.txz: Rebuilt.
l/M2Crypto-0.41.0-x86_64-2.txz: Rebuilt.
l/Mako-1.3.2-x86_64-2.txz: Rebuilt.
l/PyQt-builder-1.15.4-x86_64-2.txz: Rebuilt.
l/PyQt5-5.15.10-x86_64-2.txz: Rebuilt.
l/PyQt5_sip-12.13.0-x86_64-2.txz: Rebuilt.
l/QScintilla-2.14.1-x86_64-3.txz: Rebuilt.
l/avahi-20240306_709e60f-x86_64-2.txz: Rebuilt.
l/brotli-1.1.0-x86_64-2.txz: Rebuilt.
l/dbus-python-1.3.2-x86_64-2.txz: Rebuilt.
l/gexiv2-0.14.2-x86_64-3.txz: Rebuilt.
l/gi-docgen-2023.3-x86_64-2.txz: Rebuilt.
l/glade-3.40.0-x86_64-2.txz: Rebuilt.
l/gobject-introspection-1.80.0-x86_64-2.txz: Rebuilt.
l/harfbuzz-8.4.0-x86_64-1.txz: Upgraded.
l/lensfun-0.3.4-x86_64-2.txz: Rebuilt.
l/libcaca-0.99.beta20-x86_64-2.txz: Rebuilt.
l/libcap-ng-0.8.4-x86_64-2.txz: Rebuilt.
l/libieee1284-0.2.11-x86_64-8.txz: Rebuilt.
l/libimobiledevice-20231007_04c0233-x86_64-2.txz: Rebuilt.
l/libnvme-1.8-x86_64-2.txz: Rebuilt.
l/libplist-2.4.0-x86_64-2.txz: Rebuilt.
l/libwebp-1.3.2-x86_64-3.txz: Rebuilt.
l/libxml2-2.12.6-x86_64-3.txz: Rebuilt.
l/libxslt-1.1.39-x86_64-2.txz: Rebuilt.
l/newt-0.52.24-x86_64-3.txz: Rebuilt.
l/protobuf-26.1-x86_64-2.txz: Rebuilt.
l/pycairo-1.26.0-x86_64-3.txz: Rebuilt.
l/pycups-2.0.1-x86_64-7.txz: Rebuilt.
l/pycurl-7.45.3-x86_64-2.txz: Rebuilt.
l/pygobject3-3.48.1-x86_64-2.txz: Rebuilt.
l/pyparsing-3.1.2-x86_64-2.txz: Rebuilt.
l/python-Jinja2-3.1.3-x86_64-2.txz: Rebuilt.
l/python-MarkupSafe-2.1.5-x86_64-2.txz: Rebuilt.
l/python-PyYAML-6.0.1-x86_64-3.txz: Rebuilt.
l/python-alabaster-0.7.16-x86_64-2.txz: Rebuilt.
l/python-appdirs-1.4.4-x86_64-7.txz: Rebuilt.
l/python-babel-2.14.0-x86_64-2.txz: Rebuilt.
l/python-build-1.2.1-x86_64-2.txz: Rebuilt.
l/python-calver-2022.6.26-x86_64-2.txz: Rebuilt.
l/python-certifi-2024.2.2-x86_64-2.txz: Rebuilt.
l/python-cffi-1.16.0-x86_64-2.txz: Rebuilt.
l/python-chardet-5.2.0-x86_64-2.txz: Rebuilt.
l/python-charset-normalizer-3.3.2-x86_64-2.txz: Rebuilt.
l/python-distro-1.9.0-x86_64-2.txz: Rebuilt.
l/python-dnspython-2.6.1-x86_64-2.txz: Rebuilt.
l/python-docutils-0.20.1-x86_64-2.txz: Rebuilt.
l/python-doxypypy-0.8.8.7-x86_64-2.txz: Rebuilt.
l/python-doxyqml-0.5.3-x86_64-2.txz: Rebuilt.
l/python-editables-0.5-x86_64-2.txz: Rebuilt.
l/python-flit-core-3.9.0-x86_64-2.txz: Rebuilt.
l/python-future-1.0.0-x86_64-2.txz: Rebuilt.
l/python-glad2-2.0.6-x86_64-2.txz: Rebuilt.
l/python-hatchling-1.22.4-x86_64-2.txz: Rebuilt.
l/python-html5lib-1.1-x86_64-2.txz: Rebuilt.
l/python-idna-3.6-x86_64-2.txz: Rebuilt.
l/python-imagesize-1.4.1-x86_64-2.txz: Rebuilt.
l/python-importlib_metadata-7.1.0-x86_64-2.txz: Rebuilt.
l/python-installer-0.7.0-x86_64-2.txz: Rebuilt.
l/python-lxml-5.1.1-x86_64-1.txz: Upgraded.
l/python-markdown-3.6-x86_64-2.txz: Rebuilt.
l/python-notify2-0.3.1-x86_64-11.txz: Rebuilt.
l/python-packaging-24.0-x86_64-2.txz: Rebuilt.
l/python-pathspec-0.12.1-x86_64-2.txz: Rebuilt.
l/python-pbr-6.0.0-x86_64-2.txz: Rebuilt.
l/python-pillow-10.2.0-x86_64-2.txz: Rebuilt.
l/python-pluggy-1.4.0-x86_64-2.txz: Rebuilt.
l/python-ply-3.11-x86_64-9.txz: Rebuilt.
l/python-psutil-5.9.8-x86_64-2.txz: Rebuilt.
l/python-pycparser-2.21-x86_64-2.txz: Rebuilt.
l/python-pygments-2.17.2-x86_64-2.txz: Rebuilt.
l/python-pyproject-hooks-1.0.0-x86_64-2.txz: Rebuilt.
l/python-pysol_cards-0.16.0-x86_64-2.txz: Rebuilt.
l/python-pytz-2024.1-x86_64-2.txz: Rebuilt.
l/python-random2-1.0.2-x86_64-2.txz: Rebuilt.
l/python-requests-2.31.0-x86_64-2.txz: Rebuilt.
l/python-sane-2.9.1-x86_64-6.txz: Rebuilt.
l/python-setuptools_scm-8.0.4-x86_64-2.txz: Rebuilt.
l/python-six-1.16.0-x86_64-4.txz: Rebuilt.
l/python-smartypants-2.0.1-x86_64-2.txz: Rebuilt.
l/python-snowballstemmer-2.2.0-x86_64-2.txz: Rebuilt.
l/python-sphinx-7.2.6-x86_64-2.txz: Rebuilt.
l/python-sphinx_rtd_theme-2.0.0-x86_64-2.txz: Rebuilt.
l/python-tomli-2.0.1-x86_64-2.txz: Rebuilt.
l/python-tomli-w-1.0.0-x86_64-2.txz: Rebuilt.
l/python-trove-classifiers-2024.3.25-x86_64-2.txz: Rebuilt.
l/python-typing_extensions-4.10.0-x86_64-2.txz: Rebuilt.
l/python-typogrify-2.0.7-x86_64-2.txz: Rebuilt.
l/python-urllib3-2.2.1-x86_64-2.txz: Rebuilt.
l/python-webencodings-0.5.1-x86_64-2.txz: Rebuilt.
l/python-wheel-0.43.0-x86_64-2.txz: Rebuilt.
l/python-zipp-3.18.1-x86_64-2.txz: Rebuilt.
l/sip-6.8.3-x86_64-2.txz: Rebuilt.
l/speech-dispatcher-0.11.5-x86_64-2.txz: Rebuilt.
l/system-config-printer-1.5.18-x86_64-2.txz: Rebuilt.
l/talloc-2.4.2-x86_64-2.txz: Rebuilt.
l/tdb-1.4.10-x86_64-2.txz: Rebuilt.
l/tevent-0.16.1-x86_64-2.txz: Rebuilt.
n/epic5-2.1.12-x86_64-7.txz: Rebuilt.
n/fetchmail-6.4.38-x86_64-2.txz: Rebuilt.
n/getmail-6.18.14-x86_64-2.txz: Rebuilt.
n/gpgme-1.23.2-x86_64-3.txz: Rebuilt.
n/net-snmp-5.9.4-x86_64-2.txz: Rebuilt.
n/nftables-1.0.9-x86_64-2.txz: Rebuilt.
n/nmap-7.94-x86_64-2.txz: Rebuilt.
n/nss-pam-ldapd-0.9.12-x86_64-4.txz: Rebuilt.
n/obexftp-0.24.2-x86_64-12.txz: Rebuilt.
n/pssh-2.3.5-x86_64-2.txz: Rebuilt.
n/samba-4.20.0-x86_64-2.txz: Rebuilt.
x/ibus-1.5.29-x86_64-3.txz: Rebuilt.
x/ibus-anthy-1.5.16-x86_64-2.txz: Rebuilt.
x/ibus-hangul-1.5.5-x86_64-2.txz: Rebuilt.
x/ibus-libpinyin-1.15.7-x86_64-2.txz: Rebuilt.
x/ibus-table-1.17.4-x86_64-2.txz: Rebuilt.
x/marisa-0.2.6-x86_64-9.txz: Rebuilt.
x/pyxdg-0.28-x86_64-2.txz: Rebuilt.
x/xcb-proto-1.16.0-x86_64-3.txz: Rebuilt.
xap/blueman-2.3.5-x86_64-2.txz: Rebuilt.
xap/hexchat-2.16.2-x86_64-2.txz: Rebuilt.
xap/vim-gvim-9.1.0225-x86_64-1.txz: Upgraded.
extra/brltty/brltty-6.6-x86_64-3.txz: Rebuilt.
Diffstat (limited to 'source/d')
-rwxr-xr-x | source/d/Cython/Cython.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/distcc/distcc.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/gdb/gdb.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/gyp/gyp.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/llvm/llvm.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/mercurial/mercurial.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/meson/meson.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/python-pip/python-pip.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/python-setuptools/python-setuptools.SlackBuild | 2 | ||||
-rw-r--r-- | source/d/python3/README | 18 | ||||
-rw-r--r-- | source/d/python3/python.sysconfig.py.x86_64.diff | 24 | ||||
-rwxr-xr-x | source/d/python3/python3.SlackBuild | 41 | ||||
-rw-r--r-- | source/d/python3/python3.distutils.x86_64.diff | 30 | ||||
-rw-r--r-- | source/d/python3/python3.no-static-library.diff | 75 | ||||
-rw-r--r-- | source/d/python3/python3.readline.set_pre_input_hook.diff | 12 | ||||
-rw-r--r-- | source/d/python3/python3.setup.py.x86_64.diff | 11 | ||||
-rwxr-xr-x | source/d/scons/scons.SlackBuild | 2 |
17 files changed, 29 insertions, 202 deletions
diff --git a/source/d/Cython/Cython.SlackBuild b/source/d/Cython/Cython.SlackBuild index 6e8bcae7b..5b2f73c67 100755 --- a/source/d/Cython/Cython.SlackBuild +++ b/source/d/Cython/Cython.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=Cython VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/d/distcc/distcc.SlackBuild b/source/d/distcc/distcc.SlackBuild index 18a578487..f4893f60a 100755 --- a/source/d/distcc/distcc.SlackBuild +++ b/source/d/distcc/distcc.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=distcc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/d/gdb/gdb.SlackBuild b/source/d/gdb/gdb.SlackBuild index 5ef2ad333..04d0ec420 100755 --- a/source/d/gdb/gdb.SlackBuild +++ b/source/d/gdb/gdb.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gdb VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/d/gyp/gyp.SlackBuild b/source/d/gyp/gyp.SlackBuild index 50bcca11a..d38402e10 100755 --- a/source/d/gyp/gyp.SlackBuild +++ b/source/d/gyp/gyp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gyp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/d/llvm/llvm.SlackBuild b/source/d/llvm/llvm.SlackBuild index aab67ce71..2cfa53b38 100755 --- a/source/d/llvm/llvm.SlackBuild +++ b/source/d/llvm/llvm.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=llvm VERSION=${VERSION:-$(echo llvm-*.tar.xz | rev | cut -f 4- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # For the two options below, either set both to OFF or *only one* to ON: diff --git a/source/d/mercurial/mercurial.SlackBuild b/source/d/mercurial/mercurial.SlackBuild index b5660cb1c..b026c8661 100755 --- a/source/d/mercurial/mercurial.SlackBuild +++ b/source/d/mercurial/mercurial.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mercurial VERSION=${VERSION:-$(echo mercurial-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/d/meson/meson.SlackBuild b/source/d/meson/meson.SlackBuild index 6e0faba19..6fc50899b 100755 --- a/source/d/meson/meson.SlackBuild +++ b/source/d/meson/meson.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=meson VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/d/python-pip/python-pip.SlackBuild b/source/d/python-pip/python-pip.SlackBuild index 596f13f21..d16a34aa7 100755 --- a/source/d/python-pip/python-pip.SlackBuild +++ b/source/d/python-pip/python-pip.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-pip VERSION=${VERSION:-$(echo pip-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} SRCNAM=pip diff --git a/source/d/python-setuptools/python-setuptools.SlackBuild b/source/d/python-setuptools/python-setuptools.SlackBuild index 2e926666e..226b41f57 100755 --- a/source/d/python-setuptools/python-setuptools.SlackBuild +++ b/source/d/python-setuptools/python-setuptools.SlackBuild @@ -35,7 +35,7 @@ fi PKGNAM=python-setuptools VERSION=${VERSION:-$(echo setuptools-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} SRCNAM=setuptools diff --git a/source/d/python3/README b/source/d/python3/README deleted file mode 100644 index 8197d5920..000000000 --- a/source/d/python3/README +++ /dev/null @@ -1,18 +0,0 @@ -Python is an interpreted, interactive, object-oriented programming -language that combines remarkable power with very clear syntax. -Python's basic power can be extended with your own modules written in C -or C++. Python is also adaptable as an extension language for existing -applications. - -Python 3 (a.k.a. "Python 3000" or "Py3k") is a new version of the -language that is incompatible with the 2.x line of releases. The -language is mostly the same, but many details, especially how built-in -objects like dictionaries and strings work, have changed considerably, -and a lot of deprecated features have finally been removed. Also, the -standard library has been reorganized in a few prominent places. - -It is safe to install alongside Slackware's Python 2.x. - -If you'd like to have HTML docs installed, get them from -<https://docs.python.org/3/download.html> (HTML format, .tar.bz2 -archive). diff --git a/source/d/python3/python.sysconfig.py.x86_64.diff b/source/d/python3/python.sysconfig.py.x86_64.diff deleted file mode 100644 index 3f607cb48..000000000 --- a/source/d/python3/python.sysconfig.py.x86_64.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- ./Lib/sysconfig.py.orig 2020-10-05 10:07:58.000000000 -0500 -+++ ./Lib/sysconfig.py 2020-10-24 17:23:51.323197869 -0500 -@@ -22,7 +22,7 @@ - 'posix_prefix': { - 'stdlib': '{installed_base}/{platlibdir}/python{py_version_short}', - 'platstdlib': '{platbase}/{platlibdir}/python{py_version_short}', -- 'purelib': '{base}/lib/python{py_version_short}/site-packages', -+ 'purelib': '{base}/lib64/python{py_version_short}/site-packages', - 'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages', - 'include': - '{installed_base}/include/python{py_version_short}{abiflags}', -@@ -33,9 +33,9 @@ - }, - 'posix_home': { - 'stdlib': '{installed_base}/lib/python', -- 'platstdlib': '{base}/lib/python', -- 'purelib': '{base}/lib/python', -- 'platlib': '{base}/lib/python', -+ 'platstdlib': '{base}/lib64/python', -+ 'purelib': '{base}/lib64/python', -+ 'platlib': '{base}/lib64/python', - 'include': '{installed_base}/include/python', - 'platinclude': '{installed_base}/include/python', - 'scripts': '{base}/bin', diff --git a/source/d/python3/python3.SlackBuild b/source/d/python3/python3.SlackBuild index d7a577a3b..89647f3fa 100755 --- a/source/d/python3/python3.SlackBuild +++ b/source/d/python3/python3.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2012-2017 Audrius Kažukauskas <audrius@neutrino.lt> -# Copyright 2017, 2018, 2019, 2024 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2017, 2018, 2019, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -58,6 +58,8 @@ mkdir -p $TMP $PKG # Python gets the compile options right without any help. if [ "$ARCH" = "i586" ]; then LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then @@ -66,6 +68,10 @@ elif [ "$ARCH" = "arm" ]; then LIBDIRSUFFIX="" elif [ "$ARCH" = "armel" ]; then LIBDIRSUFFIX="" +elif [ "$ARCH" = "aarch64" ]; then + LIBDIRSUFFIX="64" +else + LIBDIRSUFFIX="" fi # Location for Python site-packages: @@ -78,24 +84,12 @@ rm -rf $SRCNAM-$VERSION tar xf $CWD/$SRCNAM-$VERSION.tar.xz || exit 1 cd $SRCNAM-$VERSION || exit 1 -zcat $CWD/python3.readline.set_pre_input_hook.diff.gz | patch -p1 --verbose || exit 1 - -# We don't want a large libpython*.a. -zcat $CWD/python3.no-static-library.diff.gz | patch -p1 --verbose || exit 1 - -if [ "$ARCH" = "x86_64" ]; then - # Install to lib64 instead of lib. - zcat $CWD/python.sysconfig.py.x86_64.diff.gz | patch -p1 --verbose || exit 1 - zcat $CWD/python3.distutils.x86_64.diff.gz | patch -p1 --verbose || exit 1 - zcat $CWD/python3.setup.py.x86_64.diff.gz | patch -p1 --verbose || exit 1 -fi - # Fix python3 path in cgi.py. sed -i '1s|^#.*/usr/local/bin/python|#!/usr/bin/python3|' Lib/cgi.py -# If system we're building on already has Python3 with pip in site-packages, -# ignore it and install pip anyway. -sed -i 's|\("install",\)|\1 "--ignore-installed",|' Lib/ensurepip/__init__.py +## If system we're building on already has Python3 with pip in site-packages, +## ignore it and install pip anyway. +#sed -i 's|\("install",\)|\1 "--ignore-installed",|' Lib/ensurepip/__init__.py chown -R root:root . find -L . \ @@ -112,10 +106,14 @@ find -L . \ --docdir=/usr/doc/$PKGNAM-$VERSION \ --enable-ipv6 \ --enable-shared \ + --with-computed-gotos \ + --enable-optimizations \ + --with-dbmliborder=gdbm:ndbm \ --with-system-expat \ --with-system-ffi \ --enable-loadable-sqlite-extensions \ --without-ensurepip \ + --with-tzpath=/usr/share/zoneinfo \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 @@ -127,12 +125,11 @@ make install DESTDIR=$PKG || exit 1 ln -sf python${BRANCH_VERSION} python ) -## NOPE, let's try using -I instead. -## Add a symlink to cpython include directory to fix various builds that -## do not expect the new location: -#( cd $PKG/usr/include -# ln -sf python?.?/cpython . -#) +# We don't want a large libpython*.a. +find $PKG -name "libpython*.a" -exec rm --verbose "{}" \; + +# Make sure we have a non-platform-specific site-packages directory: +mkdir -p $PKG/usr/lib/python${BRANCH_VERSION}/site-packages # We'll install the python-tools under site-packages. mkdir -p $SITEPK diff --git a/source/d/python3/python3.distutils.x86_64.diff b/source/d/python3/python3.distutils.x86_64.diff deleted file mode 100644 index 09c6e9669..000000000 --- a/source/d/python3/python3.distutils.x86_64.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- ./Lib/distutils/sysconfig.py.orig 2020-10-05 10:07:58.000000000 -0500 -+++ ./Lib/distutils/sysconfig.py 2020-10-24 17:31:20.860207925 -0500 -@@ -151,7 +151,7 @@ - libdir = sys.platlibdir - else: - # Pure Python -- libdir = "lib" -+ libdir = "lib64" - libpython = os.path.join(prefix, libdir, - "python" + get_python_version()) - if standard_lib: ---- ./Lib/distutils/command/install.py.orig 2020-10-05 10:07:58.000000000 -0500 -+++ ./Lib/distutils/command/install.py 2020-10-24 17:29:58.230206077 -0500 -@@ -29,14 +29,14 @@ - - INSTALL_SCHEMES = { - 'unix_prefix': { -- 'purelib': '$base/lib/python$py_version_short/site-packages', -+ 'purelib': '$base/lib64/python$py_version_short/site-packages', - 'platlib': '$platbase/$platlibdir/python$py_version_short/site-packages', - 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', - }, - 'unix_home': { -- 'purelib': '$base/lib/python', -+ 'purelib': '$base/lib64/python', - 'platlib': '$base/$platlibdir/python', - 'headers': '$base/include/python/$dist_name', - 'scripts': '$base/bin', diff --git a/source/d/python3/python3.no-static-library.diff b/source/d/python3/python3.no-static-library.diff deleted file mode 100644 index 3b3afb07c..000000000 --- a/source/d/python3/python3.no-static-library.diff +++ /dev/null @@ -1,75 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: David Malcolm <dmalcolm@redhat.com> -Date: Mon, 18 Jan 2010 17:59:07 +0000 -Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Downstream only: not appropriate for upstream. - -See https://bugzilla.redhat.com/show_bug.cgi?id=556092 - -Co-authored-by: David Malcolm <dmalcolm@redhat.com> -Co-authored-by: Bohuslav Kabrda <bkabrda@redhat.com> -Co-authored-by: Matej Stuchlik <mstuchli@redhat.com> -Co-authored-by: Robert Kuska <rkuska@redhat.com> -Co-authored-by: Charalampos Stratakis <cstratak@redhat.com> -Co-authored-by: Miro Hrončok <miro@hroncok.cz> ---- - Makefile.pre.in | 21 ++------------------- - 1 file changed, 2 insertions(+), 19 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 77f91e72b1..bb4069b18a 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -586,7 +586,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c - $(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir) - - # Build the interpreter --$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS) -+$(BUILDPYTHON): Programs/python.o $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS) - $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) - - platform: $(BUILDPYTHON) pybuilddir.txt -@@ -634,12 +634,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o - _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ - $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build - -- --# Build static library --$(LIBRARY): $(LIBRARY_OBJS) -- -rm -f $@ -- $(AR) $(ARFLAGS) $@ $(LIBRARY_OBJS) -- - libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS) - if test $(INSTSONAME) != $(LDLIBRARY); then \ - $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \ -@@ -721,7 +715,7 @@ Makefile Modules/config.c: Makefile.pre \ - @echo "The Makefile was updated, you may need to re-run make." - - --Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS) -+Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS) - $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) - - ############################################################################ -@@ -1630,17 +1624,6 @@ libainstall: @DEF_MAKE_RULE@ python-config - else true; \ - fi; \ - done -- @if test -d $(LIBRARY); then :; else \ -- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ -- if test "$(SHLIB_SUFFIX)" = .dll; then \ -- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ -- else \ -- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ -- fi; \ -- else \ -- echo Skip install of $(LIBRARY) - use make frameworkinstall; \ -- fi; \ -- fi - $(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c - $(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o - $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in diff --git a/source/d/python3/python3.readline.set_pre_input_hook.diff b/source/d/python3/python3.readline.set_pre_input_hook.diff deleted file mode 100644 index b55820c48..000000000 --- a/source/d/python3/python3.readline.set_pre_input_hook.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- ./Modules/readline.c.orig 2009-10-26 21:32:51.000000000 +0200 -+++ ./Modules/readline.c 2010-05-30 14:07:10.000000000 +0300 -@@ -12,6 +12,9 @@ - #include <errno.h> - #include <sys/time.h> - -+/* This seems to be needed for set_pre_input_hook to work */ -+#define HAVE_RL_PRE_INPUT_HOOK 1 -+ - #if defined(HAVE_SETLOCALE) - /* GNU readline() mistakenly sets the LC_CTYPE locale. - * This is evil. Only the user or the app's main() should do this! diff --git a/source/d/python3/python3.setup.py.x86_64.diff b/source/d/python3/python3.setup.py.x86_64.diff deleted file mode 100644 index a7dd2a3b4..000000000 --- a/source/d/python3/python3.setup.py.x86_64.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./setup.py.orig 2020-10-05 10:07:58.000000000 -0500 -+++ ./setup.py 2020-10-24 17:35:07.299212991 -0500 -@@ -744,7 +744,7 @@ - # directories (i.e. '.' and 'Include') must be first. See issue - # 10520. - if not CROSS_COMPILING: -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - # only change this for cross builds for 3.3, issues on Mageia - if CROSS_COMPILING: diff --git a/source/d/scons/scons.SlackBuild b/source/d/scons/scons.SlackBuild index b9af3260f..a9f8b440f 100755 --- a/source/d/scons/scons.SlackBuild +++ b/source/d/scons/scons.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=scons VERSION=${VERSION:-$(echo SCons-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |