diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2020-10-25 18:05:51 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-10-26 08:18:35 +0100 |
commit | 7e354ebac35f9b1630bc52a2019fe095d3fb3f25 (patch) | |
tree | ae89d99283ee28b8e0fb04e419c82c67d76b17a4 /source/d/python3 | |
parent | 3a960a3250417371db3f50c52413bcfcb1953e2c (diff) | |
download | current-7e354ebac35f9b1630bc52a2019fe095d3fb3f25.tar.gz |
Sun Oct 25 18:05:51 UTC 202020201025180551
a/aaa_terminfo-6.2_20201024-x86_64-1.txz: Upgraded.
a/libpwquality-1.4.4-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
a/util-linux-2.36-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
ap/hplip-3.20.6-x86_64-3.txz: Rebuilt.
Recompiled against python3-3.9.0.
ap/inxi-20201016_e45c6960-noarch-1.txz: Upgraded.
ap/linuxdoc-tools-0.9.73-x86_64-7.txz: Rebuilt.
ap/lxc-2.0.11_fad08f383-x86_64-5.txz: Rebuilt.
Recompiled against python3-3.9.0.
ap/neofetch-20201016_f0b16b6-noarch-1.txz: Upgraded.
ap/rpm-4.16.0-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
ap/undervolt-20201024_13fa33d-x86_64-1.txz: Upgraded.
Compiled against python3-3.9.0.
d/Cython-0.29.21-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
d/distcc-3.3.3-x86_64-4.txz: Rebuilt.
Recompiled against python3-3.9.0.
d/gdb-10.1-x86_64-1.txz: Upgraded.
Compiled against python3-3.9.0.
d/gyp-20200512_caa60026-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
d/llvm-11.0.0-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
d/mercurial-5.5.2-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
d/meson-0.55.3-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
d/python-pip-20.2.4-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
d/python-setuptools-50.3.2-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
d/python3-3.9.0-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
This update is a bit painful in that it will require most third-party
packages using python3 to be recompiled. But, we needed to get this out
of the way before moving on to bigger and better things. :-)
d/scons-4.0.1-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
kde/pykde4-4.14.3-x86_64-11.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/M2Crypto-0.36.0-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/Mako-1.1.3-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/PyQt-4.12.3-x86_64-3.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/PyQt5-5.15.1-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/QScintilla-2.11.5-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/boost-1.74.0-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/brotli-1.0.9-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/dbus-python-1.2.16-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/gexiv2-0.12.0-x86_64-3.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/gobject-introspection-1.64.1-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/libcaca-0.99.beta19-x86_64-7.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/libcap-ng-0.8-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/libimobiledevice-20200615_4791a82-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/libproxy-0.4.15-x86_64-5.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/libwebp-1.1.0-x86_64-3.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/libxml2-2.9.10-x86_64-3.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/ncurses-6.2_20201024-x86_64-1.txz: Upgraded.
l/newt-0.52.21-x86_64-3.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/pycairo-1.20.0-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/pycups-2.0.1-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/pycurl-7.43.0.6-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/pygobject-2.28.7-x86_64-6.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/pygobject3-3.36.1-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/pyparsing-2.4.7-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/python-appdirs-1.4.4-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/python-certifi-2020.6.20-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/python-chardet-3.0.4-x86_64-6.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/python-distro-1.5.0-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/python-docutils-0.16-x86_64-4.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/python-future-0.18.2-x86_64-3.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/python-idna-2.10-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/python-notify2-0.3.1-x86_64-6.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/python-packaging-20.4-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/python-pillow-8.0.1-x86_64-1.txz: Upgraded.
Compiled against python3-3.9.0.
l/python-ply-3.11-x86_64-4.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/python-pygments-2.7.2-x86_64-1.txz: Upgraded.
Compiled against python3-3.9.0.
l/python-requests-2.24.0-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/python-sane-2.8.3-x86_64-6.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/python-six-1.15.0-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/python-urllib3-1.25.11-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/sip-4.19.23-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/system-config-printer-1.5.12-x86_64-5.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/talloc-2.3.1-x86_64-4.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/tdb-1.4.3-x86_64-4.txz: Rebuilt.
Recompiled against python3-3.9.0.
l/tevent-0.10.2-x86_64-4.txz: Rebuilt.
Recompiled against python3-3.9.0.
n/bind-9.16.8-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
n/epic5-2.1.2-x86_64-4.txz: Rebuilt.
Recompiled against python3-3.9.0.
n/fetchmail-6.4.12-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
n/getmail-6.03-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
n/gpgme-1.14.0-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
n/libgcrypt-1.8.7-x86_64-1.txz: Upgraded.
n/net-snmp-5.9-x86_64-3.txz: Rebuilt.
Recompiled against python3-3.9.0.
n/obexftp-0.24.2-x86_64-6.txz: Rebuilt.
Recompiled against python3-3.9.0.
n/pssh-2.3.4-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
n/samba-4.13.0-x86_64-3.txz: Rebuilt.
Recompiled against python3-3.9.0.
x/pyxdg-0.27-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
x/xcb-proto-1.14.1-x86_64-2.txz: Rebuilt.
Recompiled against python3-3.9.0.
xap/blueman-2.1.3-x86_64-3.txz: Rebuilt.
Recompiled against python3-3.9.0.
xap/hexchat-2.14.3-x86_64-4.txz: Rebuilt.
Recompiled against python3-3.9.0.
Diffstat (limited to 'source/d/python3')
-rw-r--r-- | source/d/python3/python.sysconfig.py.x86_64.diff | 33 | ||||
-rwxr-xr-x | source/d/python3/python3.SlackBuild | 8 | ||||
-rw-r--r-- | source/d/python3/python3.distutils.x86_64.diff | 30 | ||||
-rw-r--r-- | source/d/python3/python3.no-static-library.diff | 23 | ||||
-rw-r--r-- | source/d/python3/python3.setup.py.x86_64.diff | 11 | ||||
-rw-r--r-- | source/d/python3/python3.x86_64.diff | 170 |
6 files changed, 90 insertions, 185 deletions
diff --git a/source/d/python3/python.sysconfig.py.x86_64.diff b/source/d/python3/python.sysconfig.py.x86_64.diff new file mode 100644 index 00000000..bf5adb0d --- /dev/null +++ b/source/d/python3/python.sysconfig.py.x86_64.diff @@ -0,0 +1,33 @@ +--- ./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', +@@ -64,7 +64,7 @@ + 'posix_user': { + 'stdlib': '{userbase}/{platlibdir}/python{py_version_short}', + 'platstdlib': '{userbase}/{platlibdir}/python{py_version_short}', +- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', ++ 'purelib': '{userbase}/lib64/python{py_version_short}/site-packages', + 'platlib': '{userbase}/{platlibdir}/python{py_version_short}/site-packages', + 'include': '{userbase}/include/python{py_version_short}', + 'scripts': '{userbase}/bin', diff --git a/source/d/python3/python3.SlackBuild b/source/d/python3/python3.SlackBuild index ee943a8b..c437325c 100755 --- a/source/d/python3/python3.SlackBuild +++ b/source/d/python3/python3.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=python3 SRCNAM=Python VERSION=$(echo $SRCNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev) BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . ) -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -81,12 +81,15 @@ 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/python3.x86_64.diff.gz | patch -p1 --verbose || exit 1 + 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. @@ -106,6 +109,7 @@ find -L . \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --with-platlibdir=lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ --enable-ipv6 \ diff --git a/source/d/python3/python3.distutils.x86_64.diff b/source/d/python3/python3.distutils.x86_64.diff new file mode 100644 index 00000000..09c6e966 --- /dev/null +++ b/source/d/python3/python3.distutils.x86_64.diff @@ -0,0 +1,30 @@ +--- ./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 index 76a75402..3b3afb07 100644 --- a/source/d/python3/python3.no-static-library.diff +++ b/source/d/python3/python3.no-static-library.diff @@ -1,4 +1,4 @@ -From 2559cbe8f0431ba20de8a1c9921013e5e3820967 Mon Sep 17 00:00:00 2001 +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 @@ -21,19 +21,19 @@ Co-authored-by: Miro HronĨok <miro@hroncok.cz> 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 4ad3df1122..72d202d71b 100644 +index 77f91e72b1..bb4069b18a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -562,7 +562,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c +@@ -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) -+$(BUILDPYTHON): Programs/python.o $(LDLIBRARY) $(PY3LIBRARY) +-$(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 -@@ -610,12 +610,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o +@@ -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 @@ -46,16 +46,16 @@ index 4ad3df1122..72d202d71b 100644 libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS) if test $(INSTSONAME) != $(LDLIBRARY); then \ $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \ -@@ -693,7 +687,7 @@ Makefile Modules/config.c: Makefile.pre \ +@@ -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) -+Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY) +-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) ############################################################################ -@@ -1557,17 +1551,6 @@ libainstall: @DEF_MAKE_RULE@ python-config +@@ -1630,17 +1624,6 @@ libainstall: @DEF_MAKE_RULE@ python-config else true; \ fi; \ done @@ -73,6 +73,3 @@ index 4ad3df1122..72d202d71b 100644 $(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 --- -2.24.1 - diff --git a/source/d/python3/python3.setup.py.x86_64.diff b/source/d/python3/python3.setup.py.x86_64.diff new file mode 100644 index 00000000..a7dd2a3b --- /dev/null +++ b/source/d/python3/python3.setup.py.x86_64.diff @@ -0,0 +1,11 @@ +--- ./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/python3/python3.x86_64.diff b/source/d/python3/python3.x86_64.diff deleted file mode 100644 index 85f62b1e..00000000 --- a/source/d/python3/python3.x86_64.diff +++ /dev/null @@ -1,170 +0,0 @@ ---- ./configure.ac.orig 2019-12-18 11:21:23.000000000 -0600 -+++ ./configure.ac 2019-12-29 18:07:37.316132144 -0600 -@@ -4668,9 +4668,9 @@ - dnl define LIBPL after ABIFLAGS and LDVERSION is defined. - AC_SUBST(PY_ENABLE_SHARED) - if test x$PLATFORM_TRIPLET = x; then -- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" -+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}" - else -- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" -+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" - fi - AC_SUBST(LIBPL) - ---- ./configure.orig 2019-12-18 11:21:23.000000000 -0600 -+++ ./configure 2019-12-29 18:07:37.320132144 -0600 -@@ -15170,9 +15170,9 @@ - - - if test x$PLATFORM_TRIPLET = x; then -- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" -+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}" - else -- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" -+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" - fi - - ---- ./Makefile.pre.in.orig 2019-12-18 11:21:23.000000000 -0600 -+++ ./Makefile.pre.in 2019-12-29 18:07:37.321132144 -0600 -@@ -143,7 +143,7 @@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include --SCRIPTDIR= $(prefix)/lib -+SCRIPTDIR= $(prefix)/lib64 - ABIFLAGS= @ABIFLAGS@ - - # Detailed destination directories ---- ./Lib/sysconfig.py.orig 2019-12-18 11:21:23.000000000 -0600 -+++ ./Lib/sysconfig.py 2019-12-29 18:07:37.322132144 -0600 -@@ -20,10 +20,10 @@ - - _INSTALL_SCHEMES = { - 'posix_prefix': { -- 'stdlib': '{installed_base}/lib/python{py_version_short}', -- 'platstdlib': '{platbase}/lib/python{py_version_short}', -- 'purelib': '{base}/lib/python{py_version_short}/site-packages', -- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', -+ 'stdlib': '{installed_base}/lib64/python{py_version_short}', -+ 'platstdlib': '{platbase}/lib64/python{py_version_short}', -+ 'purelib': '{base}/lib64/python{py_version_short}/site-packages', -+ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages', - 'include': - '{installed_base}/include/python{py_version_short}{abiflags}', - 'platinclude': -@@ -32,10 +32,10 @@ - 'data': '{base}', - }, - 'posix_home': { -- 'stdlib': '{installed_base}/lib/python', -- 'platstdlib': '{base}/lib/python', -- 'purelib': '{base}/lib/python', -- 'platlib': '{base}/lib/python', -+ 'stdlib': '{installed_base}/lib64/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', -@@ -62,10 +62,10 @@ - 'data': '{userbase}', - }, - 'posix_user': { -- 'stdlib': '{userbase}/lib/python{py_version_short}', -- 'platstdlib': '{userbase}/lib/python{py_version_short}', -- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', -- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', -+ 'stdlib': '{userbase}/lib64/python{py_version_short}', -+ 'platstdlib': '{userbase}/lib64/python{py_version_short}', -+ 'purelib': '{userbase}/lib64/python{py_version_short}/site-packages', -+ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages', - 'include': '{userbase}/include/python{py_version_short}', - 'scripts': '{userbase}/bin', - 'data': '{userbase}', ---- ./Lib/site.py.orig 2019-12-18 11:21:23.000000000 -0600 -+++ ./Lib/site.py 2019-12-29 18:07:37.324132144 -0600 -@@ -335,7 +335,7 @@ - seen.add(prefix) - - if os.sep == '/': -- sitepackages.append(os.path.join(prefix, "lib", -+ sitepackages.append(os.path.join(prefix, "lib64", - "python%d.%d" % sys.version_info[:2], - "site-packages")) - else: ---- ./Lib/distutils/command/install.py.orig 2019-12-18 11:21:23.000000000 -0600 -+++ ./Lib/distutils/command/install.py 2019-12-29 18:10:30.181135838 -0600 -@@ -29,15 +29,15 @@ - - INSTALL_SCHEMES = { - 'unix_prefix': { -- 'purelib': '$base/lib/python$py_version_short/site-packages', -- 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'purelib': '$base/lib64/python$py_version_short/site-packages', -+ 'platlib': '$platbase/lib64/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', -- 'platlib': '$base/lib/python', -+ 'purelib': '$base/lib64/python', -+ 'platlib': '$base/lib64/python', - 'headers': '$base/include/python/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', ---- ./Lib/distutils/sysconfig.py.orig 2019-12-18 11:21:23.000000000 -0600 -+++ ./Lib/distutils/sysconfig.py 2019-12-29 18:07:37.325132144 -0600 -@@ -147,7 +147,7 @@ - - if os.name == "posix": - libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ "lib64", "python" + get_python_version()) - if standard_lib: - return libpython - else: ---- ./Modules/getpath.c.orig 2019-12-18 11:21:23.000000000 -0600 -+++ ./Modules/getpath.c 2019-12-29 18:07:37.326132144 -0600 -@@ -730,7 +730,7 @@ - if (safe_wcscpy(exec_prefix, calculate->exec_prefix, exec_prefix_len) < 0) { - return PATHLEN_ERR(); - } -- status = joinpath(exec_prefix, L"lib/lib-dynload", exec_prefix_len); -+ status = joinpath(exec_prefix, L"lib64/lib-dynload", exec_prefix_len); - if (_PyStatus_EXCEPTION(status)) { - return status; - } -@@ -1067,7 +1067,7 @@ - return PATHLEN_ERR(); - } - } -- status = joinpath(zip_path, L"lib/python00.zip", zip_path_len); -+ status = joinpath(zip_path, L"lib64/python00.zip", zip_path_len); - if (_PyStatus_EXCEPTION(status)) { - return status; - } -@@ -1197,7 +1197,7 @@ - if (!calculate->exec_prefix) { - return DECODE_LOCALE_ERR("EXEC_PREFIX define", len); - } -- calculate->lib_python = Py_DecodeLocale("lib/python" VERSION, &len); -+ calculate->lib_python = Py_DecodeLocale("lib64/python" VERSION, &len); - if (!calculate->lib_python) { - return DECODE_LOCALE_ERR("EXEC_PREFIX define", len); - } ---- ./setup.py.orig 2019-12-18 11:21:23.000000000 -0600 -+++ ./setup.py 2019-12-29 18:07:37.327132144 -0600 -@@ -649,7 +649,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: |