If you would like to build the QtSql module with the SQLite v3 driver you can choose between built-in or plugin. In both cases the bundled SQLite sources are used. Now there is also an option to use the system sqlite library (as plugin).
Signed-off-by: Markus Rathgeb <[email protected]> --- rules/qt4.in | 7 +++++++ rules/qt4.make | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/rules/qt4.in b/rules/qt4.in index b24cd7d..dbeddbe 100644 --- a/rules/qt4.in +++ b/rules/qt4.in @@ -24,6 +24,7 @@ menuconfig QT4 select ALSA_LIB if QT4_BUILD_MULTIMEDIA # libsvga is currently not in ptxdist # select LIBSVGA if QT4_GFX_SVGA_PLUGIN + select SQLITE if QT4_SQLITE_SYSTEM select XORG_LIB_X11 if QT4_X11 select XORG_LIB_SM if QT4_X11_SM @@ -762,6 +763,12 @@ config QT4_SQLITE_PLUGIN bool "plugin " help Load the driver at runtime + +config QT4_SQLITE_SYSTEM + bool "system " + select SQLITE_THREADSAFE + help + Load the system SQLite3 driver at runtime endchoice endif # QT4_BUILD_SQL diff --git a/rules/qt4.make b/rules/qt4.make index 16b8639..52bc8bc 100644 --- a/rules/qt4.make +++ b/rules/qt4.make @@ -537,7 +537,7 @@ endif # is the option used if no Sql support is build? # this should be checked. As workaround use ifeq #ifdef PTXCONF_QT4_SQLITE_NONE -ifeq ($(PTXCONF_QT4_SQLITE_BUILTIN)$(PTXCONF_QT4_SQLITE_PLUGIN),) +ifeq ($(PTXCONF_QT4_SQLITE_BUILTIN)$(PTXCONF_QT4_SQLITE_PLUGIN)$(PTXCONF_QT4_SQLITE_SYSTEM),) QT4_AUTOCONF += -no-sql-sqlite endif ifdef PTXCONF_QT4_SQLITE_BUILTIN @@ -546,7 +546,9 @@ endif ifdef PTXCONF_QT4_SQLITE_PLUGIN QT4_AUTOCONF += -plugin-sql-sqlite endif - +ifdef PTXCONF_QT4_SQLITE_SYSTEM +QT4_AUTOCONF += -plugin-sql-sqlite -system-sqlite +endif ifneq ($(PTXCONF_QT4_BUILD_DESIGNERLIBS)$(PTXCONF_QT4_BUILD_ASSISTANTLIB),) QT4_AUTOCONF += -make tools QT4_BUILD_TOOLS_TARGETS = sub-tools @@ -670,7 +672,7 @@ endif ifdef PTXCONF_QT4_BUILD_SQL @$(call install_lib, qt4, 0, 0, 0644, libQtSql) endif -ifdef PTXCONF_QT4_SQLITE_PLUGIN +ifneq ($(PTXCONF_QT4_SQLITE_PLUGIN)$(PTXCONF_QT4_SQLITE_SYSTEM),) @$(call install_copy, qt4, 0, 0, 0644, -, \ /usr/plugins/sqldrivers/libqsqlite.$(QT4_PLUGIN_EXT)) endif -- 1.7.4.1 -- ptxdist mailing list [email protected]
