From 5d4e06af536b31cc983f57b6364c1dfdbfdd49a3 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 30 Oct 2019 10:10:45 +0000 Subject: community/libplist: rebuild against python 3.8 --- ...thon_devel.m4-to-newer-ax_python_devel.m4.patch | 340 +++++++++++++++++++++ 1 file changed, 340 insertions(+) create mode 100644 community/libplist/Updated-ac_python_devel.m4-to-newer-ax_python_devel.m4.patch (limited to 'community/libplist/Updated-ac_python_devel.m4-to-newer-ax_python_devel.m4.patch') diff --git a/community/libplist/Updated-ac_python_devel.m4-to-newer-ax_python_devel.m4.patch b/community/libplist/Updated-ac_python_devel.m4-to-newer-ax_python_devel.m4.patch new file mode 100644 index 0000000000..ab773d322c --- /dev/null +++ b/community/libplist/Updated-ac_python_devel.m4-to-newer-ax_python_devel.m4.patch @@ -0,0 +1,340 @@ +From 42bb64ba966082b440cb68cbdadf317f44710017 Mon Sep 17 00:00:00 2001 +From: Nikias Bassen +Date: Thu, 4 Apr 2019 01:51:02 +0300 +Subject: [PATCH] Updated ac_python_devel.m4 to newer ax_python_devel.m4 + +--- + m4/{ac_python_devel.m4 => ax_python_devel.m4} | 188 ++++++++++++------ + 1 file changed, 123 insertions(+), 65 deletions(-) + rename m4/{ac_python_devel.m4 => ax_python_devel.m4} (61%) + +diff --git a/m4/ac_python_devel.m4 b/m4/ax_python_devel.m4 +similarity index 61% +rename from m4/ac_python_devel.m4 +rename to m4/ax_python_devel.m4 +index 545c6078..44dbd83e 100644 +--- a/m4/ac_python_devel.m4 ++++ b/m4/ax_python_devel.m4 +@@ -1,10 +1,10 @@ + # =========================================================================== +-# http://autoconf-archive.cryp.to/ac_python_devel.html ++# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html + # =========================================================================== + # + # SYNOPSIS + # +-# AC_PYTHON_DEVEL([version]) ++# AX_PYTHON_DEVEL([version]) + # + # DESCRIPTION + # +@@ -12,8 +12,8 @@ + # in your configure.ac. + # + # This macro checks for Python and tries to get the include path to +-# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS) +-# output variables. It also exports $(PYTHON_EXTRA_LIBS) and ++# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output ++# variables. It also exports $(PYTHON_EXTRA_LIBS) and + # $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code. + # + # You can search for some particular version of Python by passing a +@@ -31,18 +31,15 @@ + # If you need to use this macro for an older Python version, please + # contact the authors. We're always open for feedback. + # +-# LAST MODIFICATION ++# LICENSE + # +-# 2008-04-12 +-# +-# COPYLEFT +-# +-# Copyright (c) 2008 Sebastian Huber +-# Copyright (c) 2008 Alan W. Irwin +-# Copyright (c) 2008 Rafael Laboissiere +-# Copyright (c) 2008 Andrew Collier +-# Copyright (c) 2008 Matteo Settenvini +-# Copyright (c) 2008 Horst Knorr ++# Copyright (c) 2009 Sebastian Huber ++# Copyright (c) 2009 Alan W. Irwin ++# Copyright (c) 2009 Rafael Laboissiere ++# Copyright (c) 2009 Andrew Collier ++# Copyright (c) 2009 Matteo Settenvini ++# Copyright (c) 2009 Horst Knorr ++# Copyright (c) 2013 Daniel Mullner + # + # This program is free software: you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by the +@@ -55,7 +52,7 @@ + # Public License for more details. + # + # You should have received a copy of the GNU General Public License along +-# with this program. If not, see . ++# with this program. If not, see . + # + # As a special exception, the respective Autoconf Macro's copyright owner + # gives unlimited permission to copy, distribute and modify the configure +@@ -66,11 +63,14 @@ + # all other use of the material that constitutes the Autoconf Macro. + # + # This special exception to the GPL applies to versions of the Autoconf +-# Macro released by the Autoconf Macro Archive. When you make and +-# distribute a modified version of the Autoconf Macro, you may extend this +-# special exception to the GPL to apply to your modified version as well. ++# Macro released by the Autoconf Archive. When you make and distribute a ++# modified version of the Autoconf Macro, you may extend this special ++# exception to the GPL to apply to your modified version as well. + +-AC_DEFUN([AC_PYTHON_DEVEL],[ ++#serial 21 ++ ++AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL]) ++AC_DEFUN([AX_PYTHON_DEVEL],[ + # + # Allow the use of a (user set) custom python version + # +@@ -90,8 +90,8 @@ AC_DEFUN([AC_PYTHON_DEVEL],[ + # + AC_MSG_CHECKING([for a version of Python >= '2.1.0']) + ac_supports_python_ver=`$PYTHON -c "import sys; \ +- ver = sys.version.split()[[0]]; \ +- print(ver >= '2.1.0')"` ++ ver = sys.version.split ()[[0]]; \ ++ print (ver >= '2.1.0')"` + if test "$ac_supports_python_ver" != "True"; then + if test -z "$PYTHON_NOVERSIONCHECK"; then + AC_MSG_RESULT([no]) +@@ -99,7 +99,7 @@ AC_DEFUN([AC_PYTHON_DEVEL],[ + This version of the AC@&t@_PYTHON_DEVEL macro + doesn't work properly with versions of Python before + 2.1.0. You may need to re-run configure, setting the +-variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, ++variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG, + PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. + Moreover, to disable this check, set PYTHON_NOVERSIONCHECK + to something else than an empty string. +@@ -117,10 +117,10 @@ to something else than an empty string. + if test -n "$1"; then + AC_MSG_CHECKING([for a version of Python $1]) + ac_supports_python_ver=`$PYTHON -c "import sys; \ +- ver = sys.version.split()[[0]]; \ +- print(ver >= '2.1.0')"` ++ ver = sys.version.split ()[[0]]; \ ++ print (ver $1)"` + if test "$ac_supports_python_ver" = "True"; then +- AC_MSG_RESULT([yes]) ++ AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([this package requires Python $1. +@@ -137,7 +137,7 @@ variable to configure. See ``configure --help'' for reference. + # + AC_MSG_CHECKING([for the distutils Python package]) + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ if test $? -eq 0; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +@@ -151,14 +151,17 @@ $ac_distutils_result]) + # Check for Python include path + # + AC_MSG_CHECKING([for Python include path]) +- if type $PYTHON-config; then +- PYTHON_CPPFLAGS=`$PYTHON-config --includes` +- fi + if test -z "$PYTHON_CPPFLAGS"; then + python_path=`$PYTHON -c "import distutils.sysconfig; \ +- print(distutils.sysconfig.get_python_inc());"` ++ print (distutils.sysconfig.get_python_inc ());"` ++ plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ ++ print (distutils.sysconfig.get_python_inc (plat_specific=1));"` + if test -n "${python_path}"; then +- python_path="-I$python_path" ++ if test "${plat_python_path}" != "${python_path}"; then ++ python_path="-I$python_path -I$plat_python_path" ++ else ++ python_path="-I$python_path" ++ fi + fi + PYTHON_CPPFLAGS=$python_path + fi +@@ -169,29 +172,80 @@ $ac_distutils_result]) + # Check for Python library path + # + AC_MSG_CHECKING([for Python library path]) +- if type $PYTHON-config; then +- PYTHON_LDFLAGS=`$PYTHON-config --ldflags` +- fi +- if test -z "$PYTHON_LDFLAGS"; then ++ if test -z "$PYTHON_LIBS"; then + # (makes two attempts to ensure we've got a version number + # from the interpreter) +- py_version=`$PYTHON -c "from distutils.sysconfig import *; \ +- print(' '.join(get_config_vars('VERSION')))"` +- if test "$py_version" = "[None]"; then ++ ac_python_version=`cat< +- ],[ +- Py_Initialize(); +- ],[pythonexists=yes],[pythonexists=no]) ++ AC_LANG_PUSH([C]) ++ AC_LINK_IFELSE([ ++ AC_LANG_PROGRAM([[#include ]], ++ [[Py_Initialize();]]) ++ ],[pythonexists=yes],[pythonexists=no]) ++ AC_LANG_POP([C]) ++ # turn back to default flags ++ CPPFLAGS="$ac_save_CPPFLAGS" ++ LIBS="$ac_save_LIBS" ++ LDFLAGS="$ac_save_LDFLAGS" + + AC_MSG_RESULT([$pythonexists]) + +- if test ! "$pythonexists" = "yes"; then +- AC_MSG_ERROR([ ++ if test ! "x$pythonexists" = "xyes"; then ++ AC_MSG_FAILURE([ + Could not link test program to Python. Maybe the main Python library has been + installed in some non-standard library path. If so, pass it to configure, +- via the LDFLAGS environment variable. +- Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib" ++ via the LIBS environment variable. ++ Example: ./configure LIBS="-L/usr/non-standard-path/python/lib" + ============================================================================ + ERROR! + You probably have to install the development version of the Python package +@@ -258,10 +320,6 @@ $ac_distutils_result]) + ]) + PYTHON_VERSION="" + fi +- AC_LANG_POP +- # turn back to default flags +- CPPFLAGS="$ac_save_CPPFLAGS" +- LIBS="$ac_save_LIBS" + + # + # all done! -- cgit v1.2.3