diff options
Diffstat (limited to 'source/d/python3')
| -rw-r--r-- | source/d/python3/README | 18 | ||||
| -rw-r--r-- | source/d/python3/python.sysconfig.py.x86_64.diff | 28 | ||||
| -rwxr-xr-x | source/d/python3/python3.SlackBuild | 4 | ||||
| -rw-r--r-- | source/d/python3/python3.distutils.x86_64.diff | 25 | ||||
| -rw-r--r-- | source/d/python3/python3.no-static-library.diff | 75 |
5 files changed, 19 insertions, 131 deletions
diff --git a/source/d/python3/README b/source/d/python3/README deleted file mode 100644 index 8197d592..00000000 --- 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 index bf5adb0d..e44cef83 100644 --- a/source/d/python3/python.sysconfig.py.x86_64.diff +++ b/source/d/python3/python.sysconfig.py.x86_64.diff @@ -1,6 +1,6 @@ ---- ./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 @@ +--- ./Lib/sysconfig.py.orig 2021-10-04 12:40:46.000000000 -0500 ++++ ./Lib/sysconfig.py 2021-10-06 15:05:01.512064906 -0500 +@@ -27,7 +27,7 @@ 'posix_prefix': { 'stdlib': '{installed_base}/{platlibdir}/python{py_version_short}', 'platstdlib': '{platbase}/{platlibdir}/python{py_version_short}', @@ -9,7 +9,7 @@ 'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages', 'include': '{installed_base}/include/python{py_version_short}{abiflags}', -@@ -33,9 +33,9 @@ +@@ -38,9 +38,9 @@ }, 'posix_home': { 'stdlib': '{installed_base}/lib/python', @@ -22,12 +22,14 @@ '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', +@@ -100,8 +100,8 @@ + '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', +- 'platlib': '{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', + 'data': '{userbase}', diff --git a/source/d/python3/python3.SlackBuild b/source/d/python3/python3.SlackBuild index c437325c..826f1eaf 100755 --- a/source/d/python3/python3.SlackBuild +++ b/source/d/python3/python3.SlackBuild @@ -82,9 +82,6 @@ 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 @@ -118,6 +115,7 @@ find -L . \ --with-system-ffi \ --enable-loadable-sqlite-extensions \ --without-ensurepip \ + --without-static-libpython \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 diff --git a/source/d/python3/python3.distutils.x86_64.diff b/source/d/python3/python3.distutils.x86_64.diff index 09c6e966..7dc9fc65 100644 --- a/source/d/python3/python3.distutils.x86_64.diff +++ b/source/d/python3/python3.distutils.x86_64.diff @@ -1,6 +1,6 @@ ---- ./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 @@ +--- ./Lib/distutils/sysconfig.py.orig 2021-10-04 12:40:46.000000000 -0500 ++++ ./Lib/distutils/sysconfig.py 2021-10-06 15:09:26.238070828 -0500 +@@ -333,7 +333,7 @@ libdir = sys.platlibdir else: # Pure Python @@ -9,22 +9,3 @@ 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 3b3afb07..00000000 --- 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 |