Py_hash_t on python27

Richard PALO richard at netbsd.org
Fri Jan 22 08:40:20 PST 2016


Le 22/01/16 17:35, Rene Engelhard a écrit :
> On Fri, Jan 22, 2016 at 05:26:05PM +0100, Richard PALO wrote:
>>>>> -#if PY_VERSION_HEX < 0x02070000
>>>>> +#if PY_VERSION_HEX < 0x03020000
>>>
>>> We need python >= 3.3 when using python3 anyway (see configure;
>>> and that is because of python3-internal changes), so that is a
>>> given.
>>>
>> ?? Python 3.2 and later define Py_hash_t already...  This is, I believe, exclusively for usage with prior versions.
> 
> Whose are not supported. As said, PyUNO needs python >= 3.3 for python 3.
> See http://cgit.freedesktop.org/libreoffice/core/tree/configure.ac#n8071
> 
> No idea whether python 2.7 is supposed to be still supported, don't think
> with 5.1s improved pyUNO.. I stopped building the extra pyUNO package for
> python 2 longish ago.
> 
> Regards,
> 
> Rene
> 
> 

We patched that long ago, and things seem to work okay (is there something in particular to watch out for?)
because LO always seemed to pick up the wrong python...!
> --- configure.ac.orig	2016-01-13 01:56:20.000000000 +0000
> +++ configure.ac
> @@ -7997,7 +7997,7 @@ no|disable)
>      else
>          # Unset variables set by the above AM_PATH_PYTHON so that
>          # we actually do check anew.
> -        unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_version am_cv_python_platform am_cv_python_pythondir am_cv_python_pyexecdir
> +        #unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_version am_cv_python_platform am_cv_python_pythondir am_cv_python_pyexecdir
>          AM_PATH_PYTHON([3.3],, [:])
>          if test "$PYTHON" = ":"; then
>              if test -z "$PYTHON_FOR_BUILD"; then
> @@ -8050,9 +8050,9 @@ if test $enable_python = system; then
>      elif test "$cross_compiling" != yes; then
>          # Unset variables set by the above AM_PATH_PYTHON so that
>          # we actually do check anew.
> -        unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_version am_cv_python_platform am_cv_python_pythondir am_cv_python_pyexecdir
> +        #unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_version am_cv_python_platform am_cv_python_pythondir am_cv_python_pyexecdir
>          # This causes an error if no python command is found
> -        AM_PATH_PYTHON([3.3])
> +        AM_PATH_PYTHON([2.6])
>          python_include=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
>          python_version=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('VERSION'));"`
>          python_libs=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBS'));"`

-- 
Richard PALO



More information about the LibreOffice mailing list