configure.ac | 10 +++++-----
pyuno/source/module/pyuno.cxx | 2 --
pyuno/source/module/pyuno_callable.cxx | 2 --
pyuno/source/module/pyuno_runtime.cxx | 2 --
pyuno/source/module/pyuno_struct.cxx | 2 --
5 files changed, 5 insertions(+), 13 deletions(-)
New commits:
commit aa02205fc46ed53a0af18517c3cd4064d514f85f
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Mar 6 11:42:30 2018 +0100
configure,pyuno: require at least Python 2.7
Nobody needs to use 2.6 any more, so reduce the maintenance burden.
https://lists.freedesktop.org/archives/libreoffice/2018-March/079670.html
Change-Id: I101e26fbceffbe6119f4a6484530f27760b03eb4
Reviewed-on: https://gerrit.libreoffice.org/50816
Reviewed-by: Michael Stahl <michael.st...@cib.de>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/configure.ac b/configure.ac
index aa44107f8e79..e4f2bb53770d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8040,14 +8040,14 @@ AC_SUBST(LIBXML_LIBS)
AC_SUBST(XMLLINT)
# =====================================================================
-# Checking for a Python interpreter with version >= 2.6.
-# Build and runtime requires Python 3 compatible version (>= 2.6).
+# Checking for a Python interpreter with version >= 2.7.
+# Build and runtime requires Python 3 compatible version (>= 2.7).
# Optionally user can pass an option to configure, i. e.
# ./configure PYTHON=/usr/bin/python
# =====================================================================
if test "$build_os" != "cygwin" -a "$enable_python" != fully-internal; then
# This allows a lack of system python with no error, we use internal one
in that case.
- AM_PATH_PYTHON([2.6],, [:])
+ AM_PATH_PYTHON([2.7],, [:])
# Clean PYTHON_VERSION checked below if cross-compiling
PYTHON_VERSION=""
if test "$PYTHON" != ":"; then
@@ -8228,11 +8228,11 @@ system)
#include <Python.h>
int main(int argc, char **argv) {
- if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6) ||
+ if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 7) ||
(PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 3)) return 0;
else return 1;
}
- ]])],[AC_MSG_RESULT([ok])],[AC_MSG_ERROR([Python >= 3.3 is needed when
building with Python 3, or Python >= 2.6 when building with Python
2])],[AC_MSG_RESULT([skipped; cross-compiling])])
+ ]])],[AC_MSG_RESULT([ok])],[AC_MSG_ERROR([Python >= 3.3 is needed when
building with Python 3, or Python >= 2.7 when building with Python
2])],[AC_MSG_RESULT([skipped; cross-compiling])])
CFLAGS=$save_CFLAGS
AC_LANG_POP(C)
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index ee66c7537d8d..dc73a754609d 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -1678,9 +1678,7 @@ static PyTypeObject PyUNOType =
nullptr,
nullptr,
nullptr
-#if PY_VERSION_HEX >= 0x02060000
, 0
-#endif
#if PY_VERSION_HEX >= 0x03040000
, nullptr
#endif
diff --git a/pyuno/source/module/pyuno_callable.cxx
b/pyuno/source/module/pyuno_callable.cxx
index 9320c8e84a8e..2075fc7e372f 100644
--- a/pyuno/source/module/pyuno_callable.cxx
+++ b/pyuno/source/module/pyuno_callable.cxx
@@ -221,9 +221,7 @@ static PyTypeObject PyUNO_callable_Type =
nullptr,
nullptr,
nullptr
-#if PY_VERSION_HEX >= 0x02060000
, 0
-#endif
#if PY_VERSION_HEX >= 0x03040000
, nullptr
#endif
diff --git a/pyuno/source/module/pyuno_runtime.cxx
b/pyuno/source/module/pyuno_runtime.cxx
index 559310220bde..751c104dca04 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -115,9 +115,7 @@ static PyTypeObject RuntimeImpl_Type =
nullptr,
nullptr,
nullptr
-#if PY_VERSION_HEX >= 0x02060000
, 0
-#endif
#if PY_VERSION_HEX >= 0x03040000
, nullptr
#endif
diff --git a/pyuno/source/module/pyuno_struct.cxx
b/pyuno/source/module/pyuno_struct.cxx
index e23b74db20eb..2fbb81350387 100644
--- a/pyuno/source/module/pyuno_struct.cxx
+++ b/pyuno/source/module/pyuno_struct.cxx
@@ -340,9 +340,7 @@ static PyTypeObject PyUNOStructType =
nullptr,
nullptr,
nullptr
-#if PY_VERSION_HEX >= 0x02060000
, 0
-#endif
#if PY_VERSION_HEX >= 0x03040000
, nullptr
#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
