Update to 1.21.0
This commit is contained in:
yixiangzhike
parent
e86724dde4
commit
31f4ecf52c
12
backport-0002-setup_py_extra_opts.patch
Normal file
12
backport-0002-setup_py_extra_opts.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git a/lang/python/Makefile.in b/lang/python/Makefile.in
|
||||
index c0fc091..d567ecb 100644
|
||||
--- a/lang/python/Makefile.in
|
||||
+++ b/lang/python/Makefile.in
|
||||
@@ -802,6 +802,7 @@ install-exec-local:
|
||||
--build-base="$$(basename "$${PYTHON}")-gpg" \
|
||||
install \
|
||||
--prefix "$(DESTDIR)$(prefix)" \
|
||||
+ $${SETUP_PY_EXTRA_OPTS:-} \
|
||||
--verbose ; \
|
||||
done
|
||||
|
||||
Binary file not shown.
BIN
gpgme-1.21.0.tar.bz2
Normal file
BIN
gpgme-1.21.0.tar.bz2
Normal file
Binary file not shown.
@ -1,687 +0,0 @@
|
||||
From 82e25a4a831699a08aeefc9f3cda4c6ebedbb26a Mon Sep 17 00:00:00 2001
|
||||
From: yixiangzhike <yixiangzhike007@163.com>
|
||||
Date: Tue, 28 Dec 2021 15:48:33 +0800
|
||||
Subject: [PATCH] gpgme Add support for building with python3.10
|
||||
|
||||
---
|
||||
configure | 634 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
configure.ac | 2 +-
|
||||
m4/python.m4 | 2 +-
|
||||
3 files changed, 636 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index f307736..6cfa831 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -23921,6 +23921,642 @@ $as_echo "$as_me: WARNING:
|
||||
|
||||
if test -n "$PYTHON"; then
|
||||
# If the user set $PYTHON, use it and don't search something else.
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.10" >&5
|
||||
+$as_echo_n "checking whether $PYTHON version is >= 3.10... " >&6; }
|
||||
+ prog="import sys
|
||||
+# split strings by '.' and convert to numeric. Append some zeros
|
||||
+# because we need at least 4 digits for the hex conversion.
|
||||
+# map returns an iterator in Python 3.0 and a list in 2.x
|
||||
+minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0]
|
||||
+minverhex = 0
|
||||
+# xrange is not present in Python 3.0 and range returns an iterator
|
||||
+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
|
||||
+sys.exit(sys.hexversion < minverhex)"
|
||||
+ if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
|
||||
+ ($PYTHON -c "$prog") >&5 2>&5
|
||||
+ ac_status=$?
|
||||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
+ (exit $ac_status); }; then :
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
+$as_echo "yes" >&6; }
|
||||
+else
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
+$as_echo "no" >&6; }
|
||||
+ as_fn_error $? "Python interpreter is too old" "$LINENO" 5
|
||||
+fi
|
||||
+ am_display_PYTHON=$PYTHON
|
||||
+ else
|
||||
+ # Otherwise, try each interpreter until we find one that satisfies
|
||||
+ # VERSION.
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.10" >&5
|
||||
+$as_echo_n "checking for a Python interpreter with version >= 3.10... " >&6; }
|
||||
+if ${am_cv_pathless_PYTHON+:} false; then :
|
||||
+ $as_echo_n "(cached) " >&6
|
||||
+else
|
||||
+
|
||||
+ for am_cv_pathless_PYTHON in python3.10 none; do
|
||||
+ test "$am_cv_pathless_PYTHON" = none && break
|
||||
+ prog="import sys
|
||||
+# split strings by '.' and convert to numeric. Append some zeros
|
||||
+# because we need at least 4 digits for the hex conversion.
|
||||
+# map returns an iterator in Python 3.0 and a list in 2.x
|
||||
+minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0]
|
||||
+minverhex = 0
|
||||
+# xrange is not present in Python 3.0 and range returns an iterator
|
||||
+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
|
||||
+sys.exit(sys.hexversion < minverhex)"
|
||||
+ if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
|
||||
+ ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
|
||||
+ ac_status=$?
|
||||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
+ (exit $ac_status); }; then :
|
||||
+ break
|
||||
+fi
|
||||
+ done
|
||||
+fi
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
|
||||
+$as_echo "$am_cv_pathless_PYTHON" >&6; }
|
||||
+ # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
|
||||
+ if test "$am_cv_pathless_PYTHON" = none; then
|
||||
+ PYTHON=:
|
||||
+ else
|
||||
+ # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
|
||||
+set dummy $am_cv_pathless_PYTHON; ac_word=$2
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||||
+if ${ac_cv_path_PYTHON+:} false; then :
|
||||
+ $as_echo_n "(cached) " >&6
|
||||
+else
|
||||
+ case $PYTHON in
|
||||
+ [\\/]* | ?:[\\/]*)
|
||||
+ ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
|
||||
+ ;;
|
||||
+ *)
|
||||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
+for as_dir in $PATH
|
||||
+do
|
||||
+ IFS=$as_save_IFS
|
||||
+ test -z "$as_dir" && as_dir=.
|
||||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
+ ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
|
||||
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
+ break 2
|
||||
+ fi
|
||||
+done
|
||||
+ done
|
||||
+IFS=$as_save_IFS
|
||||
+
|
||||
+ ;;
|
||||
+esac
|
||||
+fi
|
||||
+PYTHON=$ac_cv_path_PYTHON
|
||||
+if test -n "$PYTHON"; then
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
|
||||
+$as_echo "$PYTHON" >&6; }
|
||||
+else
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
+$as_echo "no" >&6; }
|
||||
+fi
|
||||
+
|
||||
+
|
||||
+ fi
|
||||
+ am_display_PYTHON=$am_cv_pathless_PYTHON
|
||||
+ fi
|
||||
+
|
||||
+
|
||||
+ if test "$PYTHON" = :; then
|
||||
+ :
|
||||
+ else
|
||||
+
|
||||
+
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
|
||||
+$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
|
||||
+if ${am_cv_python_version+:} false; then :
|
||||
+ $as_echo_n "(cached) " >&6
|
||||
+else
|
||||
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
||||
+fi
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
||||
+$as_echo "$am_cv_python_version" >&6; }
|
||||
+ PYTHON_VERSION=$am_cv_python_version
|
||||
+
|
||||
+
|
||||
+
|
||||
+ PYTHON_PREFIX='${prefix}'
|
||||
+
|
||||
+ PYTHON_EXEC_PREFIX='${exec_prefix}'
|
||||
+
|
||||
+
|
||||
+
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
|
||||
+$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
|
||||
+if ${am_cv_python_platform+:} false; then :
|
||||
+ $as_echo_n "(cached) " >&6
|
||||
+else
|
||||
+ am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
|
||||
+fi
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
|
||||
+$as_echo "$am_cv_python_platform" >&6; }
|
||||
+ PYTHON_PLATFORM=$am_cv_python_platform
|
||||
+
|
||||
+
|
||||
+ # Just factor out some code duplication.
|
||||
+ am_python_setup_sysconfig="\
|
||||
+import sys
|
||||
+# Prefer sysconfig over distutils.sysconfig, for better compatibility
|
||||
+# with python 3.x. See automake bug#10227.
|
||||
+try:
|
||||
+ import sysconfig
|
||||
+except ImportError:
|
||||
+ can_use_sysconfig = 0
|
||||
+else:
|
||||
+ can_use_sysconfig = 1
|
||||
+# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
|
||||
+# <https://github.com/pypa/virtualenv/issues/118>
|
||||
+try:
|
||||
+ from platform import python_implementation
|
||||
+ if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
|
||||
+ can_use_sysconfig = 0
|
||||
+except ImportError:
|
||||
+ pass"
|
||||
+
|
||||
+
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
|
||||
+$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
|
||||
+if ${am_cv_python_pythondir+:} false; then :
|
||||
+ $as_echo_n "(cached) " >&6
|
||||
+else
|
||||
+ if test "x$prefix" = xNONE
|
||||
+ then
|
||||
+ am_py_prefix=$ac_default_prefix
|
||||
+ else
|
||||
+ am_py_prefix=$prefix
|
||||
+ fi
|
||||
+ am_cv_python_pythondir=`$PYTHON -c "
|
||||
+$am_python_setup_sysconfig
|
||||
+if can_use_sysconfig:
|
||||
+ sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
|
||||
+else:
|
||||
+ from distutils import sysconfig
|
||||
+ sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
|
||||
+sys.stdout.write(sitedir)"`
|
||||
+ case $am_cv_python_pythondir in
|
||||
+ $am_py_prefix*)
|
||||
+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
|
||||
+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
|
||||
+ ;;
|
||||
+ *)
|
||||
+ case $am_py_prefix in
|
||||
+ /usr|/System*) ;;
|
||||
+ *)
|
||||
+ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
|
||||
+ ;;
|
||||
+ esac
|
||||
+ ;;
|
||||
+ esac
|
||||
+
|
||||
+fi
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
|
||||
+$as_echo "$am_cv_python_pythondir" >&6; }
|
||||
+ pythondir=$am_cv_python_pythondir
|
||||
+
|
||||
+
|
||||
+
|
||||
+ pkgpythondir=\${pythondir}/$PACKAGE
|
||||
+
|
||||
+
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
|
||||
+$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
|
||||
+if ${am_cv_python_pyexecdir+:} false; then :
|
||||
+ $as_echo_n "(cached) " >&6
|
||||
+else
|
||||
+ if test "x$exec_prefix" = xNONE
|
||||
+ then
|
||||
+ am_py_exec_prefix=$am_py_prefix
|
||||
+ else
|
||||
+ am_py_exec_prefix=$exec_prefix
|
||||
+ fi
|
||||
+ am_cv_python_pyexecdir=`$PYTHON -c "
|
||||
+$am_python_setup_sysconfig
|
||||
+if can_use_sysconfig:
|
||||
+ sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
|
||||
+else:
|
||||
+ from distutils import sysconfig
|
||||
+ sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
|
||||
+sys.stdout.write(sitedir)"`
|
||||
+ case $am_cv_python_pyexecdir in
|
||||
+ $am_py_exec_prefix*)
|
||||
+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
|
||||
+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
|
||||
+ ;;
|
||||
+ *)
|
||||
+ case $am_py_exec_prefix in
|
||||
+ /usr|/System*) ;;
|
||||
+ *)
|
||||
+ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
|
||||
+ ;;
|
||||
+ esac
|
||||
+ ;;
|
||||
+ esac
|
||||
+
|
||||
+fi
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
|
||||
+$as_echo "$am_cv_python_pyexecdir" >&6; }
|
||||
+ pyexecdir=$am_cv_python_pyexecdir
|
||||
+
|
||||
+
|
||||
+
|
||||
+ pkgpyexecdir=\${pyexecdir}/$PACKAGE
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+ #
|
||||
+ # Allow the use of a (user set) custom python version
|
||||
+ #
|
||||
+
|
||||
+
|
||||
+ # Extract the first word of "python[$PYTHON_VERSION]", so it can be a program name with args.
|
||||
+set dummy python$PYTHON_VERSION; ac_word=$2
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||||
+if ${ac_cv_path_PYTHON+:} false; then :
|
||||
+ $as_echo_n "(cached) " >&6
|
||||
+else
|
||||
+ case $PYTHON in
|
||||
+ [\\/]* | ?:[\\/]*)
|
||||
+ ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
|
||||
+ ;;
|
||||
+ *)
|
||||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
+for as_dir in $PATH
|
||||
+do
|
||||
+ IFS=$as_save_IFS
|
||||
+ test -z "$as_dir" && as_dir=.
|
||||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
+ ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
|
||||
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
+ break 2
|
||||
+ fi
|
||||
+done
|
||||
+ done
|
||||
+IFS=$as_save_IFS
|
||||
+
|
||||
+ ;;
|
||||
+esac
|
||||
+fi
|
||||
+PYTHON=$ac_cv_path_PYTHON
|
||||
+if test -n "$PYTHON"; then
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
|
||||
+$as_echo "$PYTHON" >&6; }
|
||||
+else
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
+$as_echo "no" >&6; }
|
||||
+fi
|
||||
+
|
||||
+
|
||||
+ if test -z "$PYTHON"; then
|
||||
+ as_fn_error $? "Cannot find python$PYTHON_VERSION in your system path" "$LINENO" 5
|
||||
+ PYTHON_VERSION=""
|
||||
+ fi
|
||||
+
|
||||
+ #
|
||||
+ # Check for a version of Python >= 2.1.0
|
||||
+ #
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a version of Python >= '2.1.0'" >&5
|
||||
+$as_echo_n "checking for a version of Python >= '2.1.0'... " >&6; }
|
||||
+ ac_supports_python_ver=`$PYTHON -c "import sys; \
|
||||
+ ver = sys.version.split ()[0]; \
|
||||
+ print (ver >= '2.1.0')"`
|
||||
+ if test "$ac_supports_python_ver" != "True"; then
|
||||
+ if test -z "$PYTHON_NOVERSIONCHECK"; then
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
+$as_echo "no" >&6; }
|
||||
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
+as_fn_error $? "
|
||||
+This version of the AC_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,
|
||||
+PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
|
||||
+Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
|
||||
+to something else than an empty string.
|
||||
+
|
||||
+See \`config.log' for more details" "$LINENO" 5; }
|
||||
+ else
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: skip at user request" >&5
|
||||
+$as_echo "skip at user request" >&6; }
|
||||
+ fi
|
||||
+ else
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
+$as_echo "yes" >&6; }
|
||||
+ fi
|
||||
+
|
||||
+ #
|
||||
+ # if the macro parameter ``version'' is set, honour it
|
||||
+ #
|
||||
+ if test -n ""; then
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a version of Python " >&5
|
||||
+$as_echo_n "checking for a version of Python ... " >&6; }
|
||||
+ ac_supports_python_ver=`$PYTHON -c "import sys; \
|
||||
+ ver = sys.version.split ()[0]; \
|
||||
+ print (ver )"`
|
||||
+ if test "$ac_supports_python_ver" = "True"; then
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
+$as_echo "yes" >&6; }
|
||||
+ else
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
+$as_echo "no" >&6; }
|
||||
+ as_fn_error $? "this package requires Python .
|
||||
+If you have it installed, but it isn't the default Python
|
||||
+interpreter in your system path, please pass the PYTHON_VERSION
|
||||
+variable to configure. See \`\`configure --help'' for reference.
|
||||
+" "$LINENO" 5
|
||||
+ PYTHON_VERSION=""
|
||||
+ fi
|
||||
+ fi
|
||||
+
|
||||
+ #
|
||||
+ # Check if you have distutils, else fail
|
||||
+ #
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
|
||||
+$as_echo_n "checking for the distutils Python package... " >&6; }
|
||||
+ ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||
+ ac_distutils_return=$?
|
||||
+ if test -z "$ac_distutils_result"; then
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
+$as_echo "yes" >&6; }
|
||||
+ else
|
||||
+ if test $ac_distutils_return = 0; then
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
+$as_echo "yes" >&6; }
|
||||
+ else
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
+$as_echo "no" >&6; }
|
||||
+ as_fn_error $? "cannot import Python module \"distutils\".
|
||||
+Please check your Python installation. The error was:
|
||||
+$ac_distutils_result" "$LINENO" 5
|
||||
+ PYTHON_VERSION=""
|
||||
+ fi
|
||||
+ fi
|
||||
+
|
||||
+ #
|
||||
+ # Check for Python include path
|
||||
+ #
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python include path" >&5
|
||||
+$as_echo_n "checking for Python include path... " >&6; }
|
||||
+ if test -z "$PYTHON_CPPFLAGS"; then
|
||||
+ python_path=`$PYTHON -c "import distutils.sysconfig; \
|
||||
+ 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
|
||||
+ 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
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_CPPFLAGS" >&5
|
||||
+$as_echo "$PYTHON_CPPFLAGS" >&6; }
|
||||
+
|
||||
+
|
||||
+ #
|
||||
+ # Check for Python library path
|
||||
+ #
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python library path" >&5
|
||||
+$as_echo_n "checking for Python library path... " >&6; }
|
||||
+ if test -z "$PYTHON_LDFLAGS"; then
|
||||
+ # (makes two attempts to ensure we've got a version number
|
||||
+ # from the interpreter)
|
||||
+ ac_python_version=`cat<<EOD | $PYTHON -
|
||||
+
|
||||
+# join all versioning strings, on some systems
|
||||
+# major/minor numbers could be in different list elements
|
||||
+from distutils.sysconfig import *
|
||||
+e = get_config_var('VERSION')
|
||||
+if e is not None:
|
||||
+ print(e)
|
||||
+EOD`
|
||||
+
|
||||
+ if test -z "$ac_python_version"; then
|
||||
+ if test -n "$PYTHON_VERSION"; then
|
||||
+ ac_python_version=$PYTHON_VERSION
|
||||
+ else
|
||||
+ ac_python_version=`$PYTHON -c "import sys; \
|
||||
+ print (sys.version[:3])"`
|
||||
+ fi
|
||||
+ fi
|
||||
+
|
||||
+ # Make the versioning information available to the compiler
|
||||
+
|
||||
+ # JW: We don't need it and it interferes with the hack
|
||||
+ # to detect multiple Pyhton versions
|
||||
+ #AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"],
|
||||
+ # [If available, contains the Python version number currently in use.])
|
||||
+
|
||||
+ # First, the library directory:
|
||||
+ ac_python_libdir=`cat<<EOD | $PYTHON -
|
||||
+
|
||||
+# There should be only one
|
||||
+import distutils.sysconfig
|
||||
+e = distutils.sysconfig.get_config_var('LIBDIR')
|
||||
+if e is not None:
|
||||
+ print (e)
|
||||
+EOD`
|
||||
+
|
||||
+ # Now, for the library:
|
||||
+ ac_python_library=`cat<<EOD | $PYTHON -
|
||||
+
|
||||
+import distutils.sysconfig
|
||||
+c = distutils.sysconfig.get_config_vars()
|
||||
+if 'LDVERSION' in c:
|
||||
+ print ('python'+c['LDVERSION'])
|
||||
+else:
|
||||
+ print ('python'+c['VERSION'])
|
||||
+EOD`
|
||||
+
|
||||
+ # This small piece shamelessly adapted from PostgreSQL python macro;
|
||||
+ # credits goes to momjian, I think. I'd like to put the right name
|
||||
+ # in the credits, if someone can point me in the right direction... ?
|
||||
+ #
|
||||
+ if test -n "$ac_python_libdir" -a -n "$ac_python_library"
|
||||
+ then
|
||||
+ # use the official shared library
|
||||
+ ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
|
||||
+ PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
|
||||
+ else
|
||||
+ # old way: use libpython from python_configdir
|
||||
+ ac_python_libdir=`$PYTHON -c \
|
||||
+ "from distutils.sysconfig import get_python_lib as f; \
|
||||
+ import os; \
|
||||
+ print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
|
||||
+ PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"
|
||||
+ fi
|
||||
+
|
||||
+ if test -z "PYTHON_LDFLAGS"; then
|
||||
+ as_fn_error $? "
|
||||
+ Cannot determine location of your Python DSO. Please check it was installed with
|
||||
+ dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand.
|
||||
+ " "$LINENO" 5
|
||||
+ fi
|
||||
+ fi
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_LDFLAGS" >&5
|
||||
+$as_echo "$PYTHON_LDFLAGS" >&6; }
|
||||
+
|
||||
+
|
||||
+ #
|
||||
+ # Check for site packages
|
||||
+ #
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python site-packages path" >&5
|
||||
+$as_echo_n "checking for Python site-packages path... " >&6; }
|
||||
+ if test -z "$PYTHON_SITE_PKG"; then
|
||||
+ PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
|
||||
+ print (distutils.sysconfig.get_python_lib(0,0));"`
|
||||
+ fi
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_SITE_PKG" >&5
|
||||
+$as_echo "$PYTHON_SITE_PKG" >&6; }
|
||||
+
|
||||
+
|
||||
+ #
|
||||
+ # libraries which must be linked in when embedding
|
||||
+ #
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra libraries" >&5
|
||||
+$as_echo_n "checking python extra libraries... " >&6; }
|
||||
+ if test -z "$PYTHON_EXTRA_LIBS"; then
|
||||
+ PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
|
||||
+ conf = distutils.sysconfig.get_config_var; \
|
||||
+ print (conf('LIBS') + ' ' + conf('SYSLIBS'))"`
|
||||
+ fi
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LIBS" >&5
|
||||
+$as_echo "$PYTHON_EXTRA_LIBS" >&6; }
|
||||
+
|
||||
+
|
||||
+ #
|
||||
+ # linking flags needed when embedding
|
||||
+ #
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra linking flags" >&5
|
||||
+$as_echo_n "checking python extra linking flags... " >&6; }
|
||||
+ if test -z "$PYTHON_EXTRA_LDFLAGS"; then
|
||||
+ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
|
||||
+ conf = distutils.sysconfig.get_config_var; \
|
||||
+ print (conf('LINKFORSHARED'))"`
|
||||
+ fi
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LDFLAGS" >&5
|
||||
+$as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; }
|
||||
+
|
||||
+
|
||||
+ #
|
||||
+ # final check to see if everything compiles alright
|
||||
+ #
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking consistency of all components of python development environment" >&5
|
||||
+$as_echo_n "checking consistency of all components of python development environment... " >&6; }
|
||||
+ # save current global flags
|
||||
+ ac_save_LIBS="$LIBS"
|
||||
+ ac_save_CPPFLAGS="$CPPFLAGS"
|
||||
+ LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS"
|
||||
+ CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
|
||||
+ ac_ext=c
|
||||
+ac_cpp='$CPP $CPPFLAGS'
|
||||
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
+
|
||||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
+/* end confdefs.h. */
|
||||
+
|
||||
+ #include <Python.h>
|
||||
+int
|
||||
+main ()
|
||||
+{
|
||||
+Py_Initialize();
|
||||
+ ;
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+_ACEOF
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
+ pythonexists=yes
|
||||
+else
|
||||
+ pythonexists=no
|
||||
+fi
|
||||
+rm -f core conftest.err conftest.$ac_objext \
|
||||
+ conftest$ac_exeext conftest.$ac_ext
|
||||
+ ac_ext=c
|
||||
+ac_cpp='$CPP $CPPFLAGS'
|
||||
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
+
|
||||
+ # turn back to default flags
|
||||
+ CPPFLAGS="$ac_save_CPPFLAGS"
|
||||
+ LIBS="$ac_save_LIBS"
|
||||
+
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pythonexists" >&5
|
||||
+$as_echo "$pythonexists" >&6; }
|
||||
+
|
||||
+ if test ! "x$pythonexists" = "xyes"; then
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
|
||||
+ 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\"
|
||||
+ ============================================================================
|
||||
+ You probably have to install the development version of the Python package
|
||||
+ for your distribution. The exact name of this package varies among them.
|
||||
+ ============================================================================
|
||||
+ " >&5
|
||||
+$as_echo "$as_me: WARNING:
|
||||
+ 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\"
|
||||
+ ============================================================================
|
||||
+ You probably have to install the development version of the Python package
|
||||
+ for your distribution. The exact name of this package varies among them.
|
||||
+ ============================================================================
|
||||
+ " >&2;}
|
||||
+ PYTHON_VERSION=""
|
||||
+ fi
|
||||
+
|
||||
+ #
|
||||
+ # all done!
|
||||
+ #
|
||||
+
|
||||
+ if test "$PYTHON_VERSION"; then
|
||||
+ PYTHONS="$(echo $PYTHONS $PYTHON)"
|
||||
+ PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS $PYTHON_VERSION)"
|
||||
+ fi
|
||||
+
|
||||
+ fi
|
||||
+
|
||||
+
|
||||
+ unset PYTHON
|
||||
+ unset PYTHON_VERSION
|
||||
+ unset PYTHON_CPPFLAGS
|
||||
+ unset PYTHON_LDFLAGS
|
||||
+ unset PYTHON_SITE_PKG
|
||||
+ unset PYTHON_EXTRA_LIBS
|
||||
+ unset PYTHON_EXTRA_LDFLAGS
|
||||
+ unset ac_cv_path_PYTHON
|
||||
+ unset am_cv_pathless_PYTHON
|
||||
+ unset am_cv_python_version
|
||||
+ unset am_cv_python_platform
|
||||
+ unset am_cv_python_pythondir
|
||||
+ unset am_cv_python_pyexecdir
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+ if test -n "$PYTHON"; then
|
||||
+ # If the user set $PYTHON, use it and don't search something else.
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= all" >&5
|
||||
$as_echo_n "checking whether $PYTHON version is >= all... " >&6; }
|
||||
prog="import sys
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4d32366..ba1c374 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -425,7 +425,7 @@ if test "$found_py" = "1"; then
|
||||
if test "$found_py" = "1" -o "$found_py3" = "1"; then
|
||||
# Reset everything, so that we can look for another Python.
|
||||
m4_foreach([mym4pythonver],
|
||||
- [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[all]],
|
||||
+ [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[3.10],[all]],
|
||||
[unset PYTHON
|
||||
unset PYTHON_VERSION
|
||||
unset PYTHON_CPPFLAGS
|
||||
diff --git a/m4/python.m4 b/m4/python.m4
|
||||
index fd0fe77..9ddca59 100644
|
||||
--- a/m4/python.m4
|
||||
+++ b/m4/python.m4
|
||||
@@ -42,7 +42,7 @@ AC_DEFUN([AM_PATH_PYTHON],
|
||||
m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
|
||||
[python2 python2.7 dnl
|
||||
python dnl
|
||||
- python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4
|
||||
+ python3 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4
|
||||
])
|
||||
|
||||
AC_ARG_VAR([PYTHON], [the Python interpreter])
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
47
gpgme.spec
47
gpgme.spec
@ -1,6 +1,6 @@
|
||||
Name: gpgme
|
||||
Version: 1.17.0
|
||||
Release: 3
|
||||
Version: 1.21.0
|
||||
Release: 1
|
||||
Summary: GnuPG Made Easy
|
||||
License: GPLv2+ and LGPLv2+
|
||||
URL: https://gnupg.org/related_software/gpgme/
|
||||
@ -13,14 +13,13 @@ Patch0: 0001-don-t-add-extra-libraries-for-linking.patch
|
||||
Patch1: gpgme-1.3.2-largefile.patch
|
||||
# Let's fix stupid AX_PYTHON_DEVEL
|
||||
Patch2: 0001-fix-stupid-ax_python_devel.patch
|
||||
# support python3.10
|
||||
Patch3: gpgme-Add-support-for-building-with-Python3.10.patch
|
||||
Patch3: backport-0002-setup_py_extra_opts.patch
|
||||
|
||||
BuildRequires: autoconf automake gcc gcc-c++ gawk gnupg2 >= 2.2.24
|
||||
BuildRequires: libgpg-error-devel >= 1.36 libassuan-devel >= 2.4.2
|
||||
BuildRequires: swig chrpath cmake qt5-qtbase-devel python3-devel
|
||||
Requires: gnupg2 >= 2.2.24
|
||||
Provides: %{name}%{?_isa} <= %{version}-%{release}
|
||||
Provides: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
|
||||
%description
|
||||
@ -34,10 +33,10 @@ This package provides C/C++/Qt/Python API support for GPGME.
|
||||
Summary: C++ API wrapper for GPGME
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Obsoletes: gpgme-pp < 1.8.0-7
|
||||
Obsoletes: %{name}pp
|
||||
Obsoletes: %{name}pp < %{version}-%{release}
|
||||
Provides: gpgme-pp = %{version}-%{release}
|
||||
Provides: gpgme-pp%{?_isa} = %{version}-%{release}
|
||||
Provides: %{name}pp%{?_isa} <= %{version}-%{release}
|
||||
Provides: %{name}pp%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description -n cpp-%{name}
|
||||
%{summary}.
|
||||
@ -45,8 +44,8 @@ Provides: %{name}pp%{?_isa} <= %{version}-%{release}
|
||||
%package -n qt-%{name}
|
||||
Summary: Qt API wrapper for GPGME
|
||||
Requires: cpp-%{name} = %{version}-%{release}
|
||||
Obsoletes: q%{name}
|
||||
Provides: q%{name}
|
||||
Obsoletes: q%{name} < %{version}-%{release}
|
||||
Provides: q%{name} = %{version}-%{release}
|
||||
|
||||
%description -n qt-%{name}
|
||||
%{summary}.
|
||||
@ -56,8 +55,8 @@ Summary: %{name} bindings for Python3
|
||||
%{?python_provide:%python_provide python3-gpg}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Obsoletes: platform-python-gpg < %{version}-%{release}
|
||||
Obsoletes: python3-gpg
|
||||
Provides: python3-gpg
|
||||
Obsoletes: python3-gpg < %{version}-%{release}
|
||||
Provides: python3-gpg = %{version}-%{release}
|
||||
|
||||
%description -n python3-%{name}
|
||||
%{summary}.
|
||||
@ -65,10 +64,10 @@ Provides: python3-gpg
|
||||
%package devel
|
||||
Summary: Development headers and libraries for %{name}
|
||||
Requires: %{name} = %{version}-%{release} libgpg-error-devel >= 1.36 info
|
||||
Obsoletes: gpgme-pp-devel < 1.8.0-7 %{name}pp-devel q%{name}-devel
|
||||
Provides: gpgme-pp-devel = %{version}-%{release} %{name}pp-devel q%{name}-devel
|
||||
Obsoletes: %{name}pp-devel q%{name}-devel
|
||||
provides: %{name}pp-devel q%{name}-devel
|
||||
Obsoletes: gpgme-pp-devel < 1.8.0-7
|
||||
Provides: gpgme-pp-devel = %{version}-%{release}
|
||||
Obsoletes: %{name}pp-devel < %{version}-%{release} q%{name}-devel < %{version}-%{release}
|
||||
Provides: %{name}pp-devel = %{version}-%{release} q%{name}-devel = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
%{summary}.
|
||||
@ -84,17 +83,13 @@ BuildArch: noarch
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
|
||||
%build
|
||||
# Generate the same python dir as in the %%install
|
||||
export SETUPTOOLS_USE_DISTUTILS=stdlib
|
||||
%configure --disable-static --disable-silent-rules --enable-languages=cpp,qt,python
|
||||
%make_build
|
||||
|
||||
%install
|
||||
# python-setuptools >= v60.0.0 changes the SETUPTOOLS_USE_DISTUTILS default value to local,
|
||||
# it does't use Python's standard library distutils default.
|
||||
# As a result, failed to build gpgme.
|
||||
# Now, set SETUPTOOLS_USE_DISTUTILS value to stdlib
|
||||
export SETUPTOOLS_USE_DISTUTILS=stdlib
|
||||
# The SETUP_PY_EXTRA_OPTS used in the patch backport-0002-setup_py_extra_opts.patch
|
||||
# This forces setuptools to use .egg-info format
|
||||
export SETUP_PY_EXTRA_OPTS="--single-version-externally-managed --root=/"
|
||||
%make_install
|
||||
|
||||
chrpath -d $(find %{buildroot} -name gpgme-json)
|
||||
@ -108,8 +103,6 @@ chrpath -d %{buildroot}%{_libdir}/lib%{name}pp.so*
|
||||
chrpath -d %{buildroot}%{_libdir}/libq%{name}.so*
|
||||
|
||||
%check
|
||||
# Generate the same python dir as in the %%install
|
||||
export SETUPTOOLS_USE_DISTUTILS=stdlib
|
||||
make check
|
||||
|
||||
%ldconfig_scriptlets
|
||||
@ -155,6 +148,12 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jul 17 2023 yixiangzhike <yixiangzhike007@163.com> - 1.21.0-1
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:update to 1.21.0
|
||||
|
||||
* Sat May 13 2023 yixiangzhike <yixiangzhike007@163.com> - 1.17.0-3
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user