| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071 |
- From f2965dfb1aa4f6b3216f3bb1d20f99326f127079 Mon Sep 17 00:00:00 2001
- From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- Date: Wed, 22 Feb 2017 17:20:45 -0800
- Subject: [PATCH] Add option to disable the sqlite3 module
- Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- Signed-off-by: Samuel Martin <s.martin49@gmail.com>
- [ Andrey Smirnov: ported to Python 3.6 ]
- Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
- [aduskett@gmail.com: Update for python 3.6.4]
- Signed-off-by: Adam Duskett <aduskett@gmail.com>
- ---
- Makefile.pre.in | 7 +++++--
- configure.ac | 9 +++++++++
- 2 files changed, 14 insertions(+), 2 deletions(-)
- diff --git a/Makefile.pre.in b/Makefile.pre.in
- index 931cc3ed07..a1ce0712cd 100644
- --- a/Makefile.pre.in
- +++ b/Makefile.pre.in
- @@ -1237,7 +1237,6 @@ LIBSUBDIRS= tkinter site-packages \
- email email/mime \
- ensurepip ensurepip/_bundled \
- html json http dbm xmlrpc \
- - sqlite3 \
- logging csv wsgiref urllib \
- ctypes ctypes/macholib \
- idlelib idlelib/Icons \
- @@ -1289,7 +1289,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
- test/test_asyncio \
- test/test_email test/test_email/data \
- test/test_json \
- - sqlite3/test \
- ctypes/test \
- idlelib/idle_test \
- distutils/tests \
- @@ -1307,6 +1305,11 @@ TESTSUBDIRS += lib2to3/tests \
- lib2to3/tests/data/fixers/myfixes
- endif
-
- +ifeq (@SQLITE3@,yes)
- +LIBSUBDIRS += sqlite3
- +TESTSUBDIRS += sqlite3/test
- +endif
- +
- ifeq (@TEST_MODULES@,yes)
- LIBSUBDIRS += $(TESTSUBDIRS)
- endif
- diff --git a/configure.ac b/configure.ac
- index 13b2edf8b7..d7582cfea4 100644
- --- a/configure.ac
- +++ b/configure.ac
- @@ -3112,6 +3112,15 @@ if test "$posix_threads" = "yes"; then
- AC_CHECK_FUNCS(pthread_atfork)
- fi
-
- +AC_SUBST(SQLITE3)
- +AC_ARG_ENABLE(sqlite3,
- + AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]),
- + [ SQLITE3="${enableval}" ], [ SQLITE3=yes ])
- +
- +if test "$SQLITE3" = "no" ; then
- + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
- +fi
- +
- AC_SUBST(PYDOC)
-
- AC_ARG_ENABLE(pydoc,
- --
- 2.13.5
|
