From 37498e325fe958c6948fae9ee70e16ec9427d9a4 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 29 Feb 2020 10:21:37 +0100 Subject: 20200229.1 global branch merge. Signed-off-by: Matteo Bernardini --- python/python3/README | 18 --- .../python3/patches/python3.no-static-library.diff | 50 ------- .../python3.readline.set_pre_input_hook.diff | 12 -- python/python3/patches/python3.x86_64.diff | 156 -------------------- python/python3/python3.SlackBuild | 157 --------------------- python/python3/python3.info | 10 -- python/python3/slack-desc | 19 --- 7 files changed, 422 deletions(-) delete mode 100644 python/python3/README delete mode 100644 python/python3/patches/python3.no-static-library.diff delete mode 100644 python/python3/patches/python3.readline.set_pre_input_hook.diff delete mode 100644 python/python3/patches/python3.x86_64.diff delete mode 100644 python/python3/python3.SlackBuild delete mode 100644 python/python3/python3.info delete mode 100644 python/python3/slack-desc (limited to 'python/python3') diff --git a/python/python3/README b/python/python3/README deleted file mode 100644 index 8197d59201..0000000000 --- a/python/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 - (HTML format, .tar.bz2 -archive). diff --git a/python/python3/patches/python3.no-static-library.diff b/python/python3/patches/python3.no-static-library.diff deleted file mode 100644 index 2e03ab8add..0000000000 --- a/python/python3/patches/python3.no-static-library.diff +++ /dev/null @@ -1,50 +0,0 @@ ---- ./Makefile.pre.in.orig 2019-01-13 13:06:37.518767495 -0600 -+++ ./Makefile.pre.in 2019-01-13 13:28:41.778781670 -0600 -@@ -549,7 +549,7 @@ - $(PYTHON_FOR_REGEN) ./Tools/clinic/clinic.py --make - - # Build the interpreter --$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) -+$(BUILDPYTHON): Programs/python.o $(LDLIBRARY) $(PY3LIBRARY) - $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) - - platform: $(BUILDPYTHON) pybuilddir.txt -@@ -598,11 +598,6 @@ - $(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) - if test $(INSTSONAME) != $(LDLIBRARY); then \ - $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ -@@ -692,7 +687,7 @@ - echo "-----------------------------------------------"; \ - fi - --Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) -+Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY) - $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) - - ############################################################################ -@@ -1428,17 +1423,6 @@ - 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/python/python3/patches/python3.readline.set_pre_input_hook.diff b/python/python3/patches/python3.readline.set_pre_input_hook.diff deleted file mode 100644 index b55820c489..0000000000 --- a/python/python3/patches/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 - #include - -+/* 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/python/python3/patches/python3.x86_64.diff b/python/python3/patches/python3.x86_64.diff deleted file mode 100644 index 1649c2344a..0000000000 --- a/python/python3/patches/python3.x86_64.diff +++ /dev/null @@ -1,156 +0,0 @@ ---- ./configure.orig 2018-12-23 15:37:36.000000000 -0600 -+++ ./configure 2019-02-19 16:02:14.585002930 -0600 -@@ -15149,9 +15149,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 2018-12-23 15:37:36.000000000 -0600 -+++ ./Makefile.pre.in 2019-02-19 16:02:14.576002930 -0600 -@@ -142,7 +142,7 @@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include --SCRIPTDIR= $(prefix)/lib -+SCRIPTDIR= $(prefix)/lib64 - ABIFLAGS= @ABIFLAGS@ - - # Detailed destination directories ---- ./Lib/sysconfig.py.orig 2018-12-23 15:37:36.000000000 -0600 -+++ ./Lib/sysconfig.py 2019-02-19 16:02:14.574002930 -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 2018-12-23 15:37:36.000000000 -0600 -+++ ./Lib/site.py 2019-02-19 16:02:14.572002930 -0600 -@@ -334,7 +334,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 2018-12-23 15:37:36.000000000 -0600 -+++ ./Lib/distutils/command/install.py 2019-02-19 16:02:14.567002930 -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 2018-12-23 15:37:36.000000000 -0600 -+++ ./Lib/distutils/sysconfig.py 2019-02-19 16:02:14.570002930 -0600 -@@ -130,7 +130,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-02-19 16:02:14.580002930 -0600 -+++ ./Modules/getpath.c 2019-02-19 16:06:51.535002940 -0600 -@@ -500,7 +500,7 @@ - "Could not find platform dependent libraries \n"); - } - wcsncpy(exec_prefix, calculate->exec_prefix, MAXPATHLEN); -- joinpath(exec_prefix, L"lib/lib-dynload"); -+ joinpath(exec_prefix, L"lib64/lib-dynload"); - } - /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ - } -@@ -742,7 +742,7 @@ - else { - wcsncpy(calculate->zip_path, calculate->prefix, MAXPATHLEN); - } -- joinpath(calculate->zip_path, L"lib/python00.zip"); -+ joinpath(calculate->zip_path, L"lib64/python00.zip"); - - /* Replace "00" with version */ - size_t bufsz = wcslen(calculate->zip_path); -@@ -867,7 +867,7 @@ - if (!calculate->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 2018-12-23 15:37:36.000000000 -0600 -+++ ./setup.py 2019-02-19 16:02:14.587002930 -0600 -@@ -546,7 +546,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/python/python3/python3.SlackBuild b/python/python3/python3.SlackBuild deleted file mode 100644 index 190f7ec51b..0000000000 --- a/python/python3/python3.SlackBuild +++ /dev/null @@ -1,157 +0,0 @@ -#!/bin/sh - -# Slackware build script for python3 - -# Copyright 2012-2019 Audrius Kažukauskas -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=python3 -SRCNAM=Python -VERSION=${VERSION:-3.7.2} -BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . ) -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -# Don't set any SLKCFLAGS here, or OPT="$SLKCFLAGS" before the ./configure. -# Python gets the compile options right without any help. -if [ "$ARCH" = "i586" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" -else - LIBDIRSUFFIX="" -fi - -set -e - -# Location for Python site-packages. -SITEPK=$PKG/usr/lib${LIBDIRSUFFIX}/python${BRANCH_VERSION}/site-packages -# Same as above without $PKG. -TOOLSDIR=/usr/lib${LIBDIRSUFFIX}/python${BRANCH_VERSION}/site-packages - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.xz -cd $SRCNAM-$VERSION - -patch -p1 -i $CWD/patches/python3.readline.set_pre_input_hook.diff -# We don't want a large libpython*.a. -patch -p1 -i $CWD/patches/python3.no-static-library.diff - -if [ "$ARCH" = "x86_64" ]; then - # Install to lib64 instead of lib. - patch -p1 -i $CWD/patches/python3.x86_64.diff -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 - -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-threads \ - --enable-ipv6 \ - --enable-shared \ - --with-system-expat \ - --with-system-ffi \ - --enable-loadable-sqlite-extensions \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -# Restore original ensurepip behaviour. -sed -i 's| "--ignore-installed",||' \ - $PKG/usr/lib${LIBDIRSUFFIX}/python${BRANCH_VERSION}/ensurepip/__init__.py - -# Remove to avoid overwriting a copy from Python2. -rm -f $PKG/usr/bin/2to3 - -# We'll install the python-tools under site-packages. -mkdir -p $SITEPK -cp -a Tools/* $SITEPK - -# Remove DOS batch/exe files. -find $PKG \( -name '*.exe' -o -name '*.bat' \) -exec rm -f '{}' \; - -# Fix permissions on dynamic libraries. -find $PKG -type f -perm 555 -exec chmod 755 '{}' \; - -# Install docs. -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.rst LICENSE Misc $PKG/usr/doc/$PRGNAM-$VERSION -# Delete stuff that we don't need to package. -rm -f $PKG/usr/doc/$PKGNAM-$VERSION/Misc/{HISTORY,*.in,*.wpr,python.man,svnmap.txt} -mv $SITEPK/README $PKG/usr/doc/$PRGNAM-$VERSION/README.python-tools -( cd $PKG/usr/doc/$PRGNAM-$VERSION ; ln -sf $TOOLSDIR Tools ) -if [ -e "$CWD/python-$VERSION-docs-html.tar.bz2" ]; then - tar xf $CWD/python-$VERSION-docs-html.tar.bz2 - mv python-$VERSION-docs-html $PKG/usr/doc/$PRGNAM-$VERSION/html - chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION/html -fi - -# Fix possible incorrect permissions. -( cd $PKG - find . -type d -exec chmod 755 "{}" \; - find . -perm 640 -exec chmod 644 "{}" \; - find . -perm 750 -exec chmod 755 "{}" \; -) - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/python/python3/python3.info b/python/python3/python3.info deleted file mode 100644 index 0cc075d48b..0000000000 --- a/python/python3/python3.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3" -VERSION="3.7.2" -HOMEPAGE="https://www.python.org/" -DOWNLOAD="https://www.python.org/ftp/python/3.7.2/Python-3.7.2.tar.xz" -MD5SUM="df6ec36011808205beda239c72f947cb" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Audrius Kažukauskas" -EMAIL="audrius@neutrino.lt" diff --git a/python/python3/slack-desc b/python/python3/slack-desc deleted file mode 100644 index bfc8d5c554..0000000000 --- a/python/python3/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3: python3 (object-oriented interpreted programming language) -python3: -python3: Python is an interpreted, interactive, object-oriented programming -python3: language that combines remarkable power with very clear syntax. -python3: This is a new version of the language that is incompatible with the -python3: 2.x line of releases. The language is mostly the same, but many -python3: details, especially how built-in objects like dictionaries and strings -python3: work, have changed considerably, and a lot of deprecated features have -python3: finally been removed. Also, the standard library has been reorganized -python3: in a few prominent places. -python3: -- cgit v1.2.3