It now builds on Ubuntu 18.10 'cosmic' as well!
It builds now! (on trusty..., working on cosmic next) 1st draft of using df Changed disk monitoring mode to enum draft install & download accounting Draft backup added DBG small fixes fixing backup accounting New debugging Better debugging MyDebug is not an Object Hotfix for backing up OS with sapces in name 3.2.3 Testing ESC key Added idle/cont fixing uncompressed size Remove focus setting from wifi dialog Fix zip files for ichigojam Fix debug MSG Different ESC implementation from menu Amend write image size Shortcut for edit configs Prevent firmware downgrade p3.2.4 Add option shortcuts p3.2.4a Added gpiochannel and gpiochannelValue to init
This commit is contained in:
@@ -1,62 +0,0 @@
|
||||
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>
|
||||
|
||||
---
|
||||
Makefile.pre.in | 24 +++++++++++++++++-------
|
||||
configure.in | 9 +++++++++
|
||||
2 file changed, 9 insertions(+)
|
||||
|
||||
Index: b/configure.ac
|
||||
===================================================================
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2627,6 +2627,15 @@
|
||||
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,
|
||||
Index: b/Makefile.pre.in
|
||||
===================================================================
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -965,7 +965,6 @@
|
||||
email email/mime \
|
||||
ensurepip ensurepip/_bundled \
|
||||
json \
|
||||
- sqlite3 \
|
||||
logging bsddb csv importlib wsgiref \
|
||||
ctypes ctypes/macholib \
|
||||
idlelib idlelib/Icons \
|
||||
@@ -983,7 +982,6 @@
|
||||
test/tracedmodules \
|
||||
email/test email/test/data \
|
||||
json/tests \
|
||||
- sqlite3/test \
|
||||
bsddb/test \
|
||||
ctypes/test \
|
||||
idlelib/idle_test \
|
||||
@@ -1006,6 +1004,11 @@
|
||||
lib2to3/tests/data/fixers/myfixes
|
||||
endif
|
||||
|
||||
+ifeq (@SQLITE3@,yes)
|
||||
+LIBSUBDIRS += sqlite3
|
||||
+TESTSUBDIRS += sqlite3/test
|
||||
+endif
|
||||
+
|
||||
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
|
||||
@for i in $(SCRIPTDIR) $(LIBDEST); \
|
||||
do \
|
||||
Reference in New Issue
Block a user