2019-10-16 16:38:34 -06:00
|
|
|
From 1a1d13a973d9dcbd6660bfef40cf35c7638f779b Mon Sep 17 00:00:00 2001
|
2016-01-04 19:23:28 +01:00
|
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
2017-03-23 08:21:12 -07:00
|
|
|
Date: Wed, 22 Feb 2017 17:20:45 -0800
|
2016-01-04 19:23:28 +01:00
|
|
|
Subject: [PATCH] Add option to disable the sqlite3 module
|
2013-05-29 10:36:57 +02:00
|
|
|
|
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
|
|
|
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
|
2017-03-23 08:21:12 -07:00
|
|
|
[ Andrey Smirnov: ported to Python 3.6 ]
|
|
|
|
|
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
|
2013-05-29 10:36:57 +02:00
|
|
|
---
|
2016-01-04 19:23:28 +01:00
|
|
|
Makefile.pre.in | 7 +++++--
|
|
|
|
|
configure.ac | 9 +++++++++
|
|
|
|
|
2 files changed, 14 insertions(+), 2 deletions(-)
|
2013-05-29 10:36:57 +02:00
|
|
|
|
2016-01-04 19:23:28 +01:00
|
|
|
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
2019-10-16 16:38:34 -06:00
|
|
|
index 3e1f130532..cf9add0bc7 100644
|
2014-02-18 21:40:01 +01:00
|
|
|
--- a/Makefile.pre.in
|
|
|
|
|
+++ b/Makefile.pre.in
|
2019-10-16 16:38:34 -06:00
|
|
|
@@ -1328,7 +1328,6 @@ LIBSUBDIRS= tkinter site-packages \
|
2013-05-29 10:36:57 +02:00
|
|
|
email email/mime \
|
2014-02-18 21:40:01 +01:00
|
|
|
ensurepip ensurepip/_bundled \
|
2013-05-29 10:36:57 +02:00
|
|
|
html json http dbm xmlrpc \
|
|
|
|
|
- sqlite3 \
|
|
|
|
|
logging csv wsgiref urllib \
|
2014-02-18 21:40:01 +01:00
|
|
|
ctypes ctypes/macholib \
|
|
|
|
|
idlelib idlelib/Icons \
|
2019-10-16 16:38:34 -06:00
|
|
|
@@ -1402,7 +1401,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
2017-03-23 08:21:12 -07:00
|
|
|
test/test_asyncio \
|
|
|
|
|
test/test_email test/test_email/data \
|
|
|
|
|
test/test_json \
|
2014-07-08 12:42:39 +02:00
|
|
|
- sqlite3/test \
|
|
|
|
|
ctypes/test \
|
|
|
|
|
idlelib/idle_test \
|
|
|
|
|
distutils/tests \
|
2019-10-16 16:38:34 -06:00
|
|
|
@@ -1418,6 +1416,11 @@ TESTSUBDIRS += lib2to3/tests \
|
2014-02-18 21:40:01 +01:00
|
|
|
lib2to3/tests/data/fixers/myfixes
|
2013-05-29 10:36:57 +02:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
+ifeq (@SQLITE3@,yes)
|
|
|
|
|
+LIBSUBDIRS += sqlite3
|
2014-02-18 21:40:01 +01:00
|
|
|
+TESTSUBDIRS += sqlite3/test
|
2013-05-29 10:36:57 +02:00
|
|
|
+endif
|
|
|
|
|
+
|
2014-02-18 21:40:01 +01:00
|
|
|
ifeq (@TEST_MODULES@,yes)
|
|
|
|
|
LIBSUBDIRS += $(TESTSUBDIRS)
|
|
|
|
|
endif
|
2016-01-04 19:23:28 +01:00
|
|
|
diff --git a/configure.ac b/configure.ac
|
2019-10-16 16:38:34 -06:00
|
|
|
index caa8eaf88a..79a8255f44 100644
|
2016-01-04 19:23:28 +01:00
|
|
|
--- a/configure.ac
|
|
|
|
|
+++ b/configure.ac
|
2019-10-16 16:38:34 -06:00
|
|
|
@@ -3213,6 +3213,15 @@ if test "$posix_threads" = "yes"; then
|
python3: bump to 3.7.0
Other changes include:
- Refreshing all necessary patches for 3.7.0
- Add a hash for the license file.
- Python no longer has it's own internal libffi, as such, host-libffi
is now required to build host-python3, and is added as a
dependency.
- Drop PYTHON3_LIBTOOL_PATCH = NO, since there is no longer any
internal libffi copy that was causing the libtool patching process
to fail.
- A new core module "uuid" is now is added in the Config.in file, and
relies on util-linux's uuid library.
- Also, a new patch: 0030-Fix-cross-compiling-the-uuid-module.patch
is required to fix compiling the uuid module, because the include
directory search path for uuid.h is hardcoded to /usr/include/uuid,
which causes an "unsafe for cross-compilation" error during
compiling if the host pc has uuid headers installed.
- 0031-Add-an-option-to-disable-uuid-module.patch is added to allow
disabling the Python3 UUID module, so that when
BR2_PACKAGE_PYTHON3_UUID is disabled by the UUID library is
present, the uuid Python module is not built, as expected.
- 0032-fix-building-on-older-distributions.patch is added to change
os.replace by os.rename in the update_file.py script to fix
building on older Linux distributions that have older versions of
python that don't include os.replace.
os.rename acts in the same way as os.replace, but is cross-platform
compatible. Because Buildroot is guaranteed to be built in a POSIX
environment, it is safe to change replace to rename.
Tested on CentOS6 and Fedora28, All test results passed:
br-arm-full [1/6]: OK
br-arm-cortex-a9-glibc [2/6]: OK
br-arm-cortex-m4-full [3/6]: SKIPPED
br-x86-64-musl [4/6]: OK
br-arm-full-static [5/6]: SKIPPED
armv5-ctng-linux-gnueabi [6/6]: OK
6 builds, 2 skipped, 0 build failed, 0 legal-info failed
Signed-off-by: Adam Duskett <aduskett@gmail.com>
[Thomas:
- remove PYTHON3_LIBTOOL_PATCH = NO
- improve the solution in patch 0030-Fix-cross-compiling-the-uuid-module
- add patch 0031-Add-an-option-to-disable-uuid-module]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-07-20 12:10:21 -04:00
|
|
|
AC_CHECK_FUNCS(pthread_getcpuclockid)
|
2016-01-04 19:23:28 +01:00
|
|
|
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,
|
|
|
|
|
--
|
2019-10-16 16:38:34 -06:00
|
|
|
2.20.1
|
2016-01-04 19:23:28 +01:00
|
|
|
|