diff options
Diffstat (limited to 'package/python3/0019-Add-an-option-to-disable-expat.patch')
-rw-r--r-- | package/python3/0019-Add-an-option-to-disable-expat.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/package/python3/0019-Add-an-option-to-disable-expat.patch b/package/python3/0019-Add-an-option-to-disable-expat.patch index e31f3e105e..af6e1ebcc1 100644 --- a/package/python3/0019-Add-an-option-to-disable-expat.patch +++ b/package/python3/0019-Add-an-option-to-disable-expat.patch @@ -1,4 +1,4 @@ -From d88f2d3430bbbe285ae3de5fbc1bde34da7f0478 Mon Sep 17 00:00:00 2001 +From 7e0e7dc25f50acd6922493ae620ee5cbf107a79a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Date: Wed, 22 Feb 2017 17:40:45 -0800 Subject: [PATCH] Add an option to disable expat @@ -20,10 +20,10 @@ Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 660c292765..f49abf8395 100644 +index 2a82f3308f..e678c8817e 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1331,7 +1331,7 @@ LIBSUBDIRS= site-packages \ +@@ -1399,7 +1399,7 @@ LIBSUBDIRS= site-packages \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ idlelib idlelib/Icons \ @@ -32,7 +32,7 @@ index 660c292765..f49abf8395 100644 importlib \ turtledemo \ multiprocessing multiprocessing/dummy \ -@@ -1416,6 +1416,10 @@ ifeq (@CURSES@,yes) +@@ -1488,6 +1488,10 @@ ifeq (@CURSES@,yes) LIBSUBDIRS += curses endif @@ -44,16 +44,16 @@ index 660c292765..f49abf8395 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index ea422a86a9..3c1e2c088d 100644 +index acd98381a3..9ef0ecd42f 100644 --- a/configure.ac +++ b/configure.ac -@@ -2961,13 +2961,21 @@ PKG_PROG_PKG_CONFIG +@@ -3055,13 +3055,21 @@ PKG_PROG_PKG_CONFIG AC_SUBST(DISABLED_EXTENSIONS) # Check for use of the system expat library -AC_MSG_CHECKING(for --with-system-expat) -AC_ARG_WITH(system_expat, -- AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library]), +- AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library, see Doc/library/pyexpat.rst (default is no)]), +AC_MSG_CHECKING(for --with-expat) +AC_ARG_WITH(expat, + AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]), @@ -75,10 +75,10 @@ index ea422a86a9..3c1e2c088d 100644 # Check for use of the system libffi library AC_MSG_CHECKING(for --with-system-ffi) diff --git a/setup.py b/setup.py -index 1669797cad..d2727c0da5 100644 +index 4063d7ffa5..211a160f29 100644 --- a/setup.py +++ b/setup.py -@@ -1576,7 +1576,7 @@ class PyBuildExt(build_ext): +@@ -1681,7 +1681,7 @@ class PyBuildExt(build_ext): # # More information on Expat can be found at www.libexpat.org. # @@ -88,5 +88,5 @@ index 1669797cad..d2727c0da5 100644 define_macros = [] extra_compile_args = [] -- -2.20.1 +2.25.1 |