[Buildroot] [PATCH 1/4] package/sqlite: Disable autoreconf

[Buildroot] [PATCH 1/4] package/sqlite: Disable autoreconf

[Bernd Kuhls]

Currently we have no patches for this package, compilation works without
autoreconf.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/sqlite/sqlite.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index bf31292..27dad12 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -11,9 +11,6 @@ SQLITE_LICENSE = Public domain
 SQLITE_LICENSE_FILES = tea/license.terms
 SQLITE_INSTALL_STAGING = YES
 
-# Patching Makefile.am:
-SQLITE_AUTORECONF = YES
-
 ifeq ($(BR2_PACKAGE_SQLITE_STAT3),y)
 SQLITE_CFLAGS += -DSQLITE_ENABLE_STAT3
 endif
-- 
2.7.0.rc3

[Buildroot] [PATCH 2/4] package/sqlite: Dynamically link libsqlite.so to bin/sqlite3

[Bernd Kuhls]

Fixes https://bugs.busybox.net/show_bug.cgi?id=8621#c1
Lonnie Abelbeck wrote:
"recently sqlite changed it's default behavior wrt the sqlite CLI tool,
 previously it was dynamically linked with libsqlite3.so.0 by default,
 now it is statically linked by default.

The old behavior can be signaled with: --disable-static-shell"

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/sqlite/sqlite.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 27dad12..46acbf8 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -35,6 +35,8 @@ SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)"
 
 ifeq ($(BR2_STATIC_LIBS),y)
 SQLITE_CONF_OPTS += --enable-dynamic-extensions=no
+else
+SQLITE_CONF_OPTS += --disable-static-shell
 endif
 
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-- 
2.7.0.rc3

[Buildroot] [PATCH 3/4] package/sqlite: Fix readline support

[Bernd Kuhls]

Fixes https://bugs.busybox.net/show_bug.cgi?id=8621#c0

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/sqlite/sqlite.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 46acbf8..1603e00 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -47,7 +47,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_SQLITE_READLINE),y)
 SQLITE_DEPENDENCIES += ncurses readline
-SQLITE_CONF_OPTS += --with-readline-inc="-I$(STAGING_DIR)/usr/include"
+SQLITE_CONF_OPTS += --enable-readline
 else
 SQLITE_CONF_OPTS += --disable-readline
 endif
-- 
2.7.0.rc3

[Buildroot] [PATCH 4/4] package/sqlite: add optional support for libedit

[Bernd Kuhls]

Only one library is used for command-line editing by sqlite, therefore
create a choice option between current readline support and libedit.

The default of the choice option is readline in order to not change
current behaviour in buildroot. Please note that sqlite first checks
for libedit and, if found, ignores readline, see configure.ac,
lines 50+:

  if test x"$LIBS" != "x"; then
     AC_DEFINE([HAVE_EDITLINE],1,Define to use BSD editline)
  else
    unset ac_cv_search_readline
  fi

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/sqlite/Config.in | 14 +++++++++++++-
 package/sqlite/sqlite.mk |  7 +++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in
index 7ea9eb1..31add17 100644
--- a/package/sqlite/Config.in
+++ b/package/sqlite/Config.in
@@ -8,13 +8,25 @@ config BR2_PACKAGE_SQLITE
 
 if BR2_PACKAGE_SQLITE
 
+choice
+	prompt "Command-line editing"
+	default BR2_PACKAGE_SQLITE_READLINE
+	help
+	  Enable command-line editing.
+
+config BR2_PACKAGE_SQLITE_LIBEDIT
+	bool "libedit"
+	select BR2_PACKAGE_LIBEDIT
+
 config BR2_PACKAGE_SQLITE_READLINE
-	bool "Command-line editing"
+	bool "readline"
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_READLINE
 	help
 	  Enable command-line editing. This requires ncurses and readline.
 
+endchoice
+
 config BR2_PACKAGE_SQLITE_STAT3
 	bool "Additional query optimizations (stat3)"
 	help
diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 1603e00..594baff 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -45,6 +45,13 @@ else
 SQLITE_CONF_OPTS += --disable-threadsafe
 endif
 
+ifeq ($(BR2_PACKAGE_SQLITE_LIBEDIT),y)
+SQLITE_DEPENDENCIES += libedit
+SQLITE_CONF_OPTS += --enable-editline
+else
+SQLITE_CONF_OPTS += --disable-editline
+endif
+
 ifeq ($(BR2_PACKAGE_SQLITE_READLINE),y)
 SQLITE_DEPENDENCIES += ncurses readline
 SQLITE_CONF_OPTS += --enable-readline
-- 
2.7.0.rc3

[Buildroot] [PATCH 4/4] package/sqlite: add optional support for libedit

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sat, 23 Jan 2016 11:23:45 +0100, Bernd Kuhls wrote:

> diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in
> index 7ea9eb1..31add17 100644
> --- a/package/sqlite/Config.in
> +++ b/package/sqlite/Config.in
> @@ -8,13 +8,25 @@ config BR2_PACKAGE_SQLITE
>  
>  if BR2_PACKAGE_SQLITE
>  
> +choice
> +	prompt "Command-line editing"
> +	default BR2_PACKAGE_SQLITE_READLINE
> +	help
> +	  Enable command-line editing.
> +
> +config BR2_PACKAGE_SQLITE_LIBEDIT
> +	bool "libedit"
> +	select BR2_PACKAGE_LIBEDIT
> +
>  config BR2_PACKAGE_SQLITE_READLINE
> -	bool "Command-line editing"
> +	bool "readline"
>  	select BR2_PACKAGE_NCURSES
>  	select BR2_PACKAGE_READLINE
>  	help
>  	  Enable command-line editing. This requires ncurses and readline.

I am not sure I like adding a choice for such a simple thing.
Config.in choices are not randomized in our build testing.

What about instead dropping the BR2_PACKAGE_SQLITE_READLINE option, and
automatically enable readline/libedit support in sqlite when the
corresponding packages are enabled ?

Peter, what do you think ?

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 4/4] package/sqlite: add optional support for libedit

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 > Dear Bernd Kuhls,
 > On Sat, 23 Jan 2016 11:23:45 +0100, Bernd Kuhls wrote:

 >> diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in
 >> index 7ea9eb1..31add17 100644
 >> --- a/package/sqlite/Config.in
 >> +++ b/package/sqlite/Config.in
 >> @@ -8,13 +8,25 @@ config BR2_PACKAGE_SQLITE
 >> 
 >> if BR2_PACKAGE_SQLITE
 >> 
 >> +choice
 >> +	prompt "Command-line editing"
 >> +	default BR2_PACKAGE_SQLITE_READLINE
 >> +	help
 >> +	  Enable command-line editing.
 >> +
 >> +config BR2_PACKAGE_SQLITE_LIBEDIT
 >> +	bool "libedit"
 >> +	select BR2_PACKAGE_LIBEDIT
 >> +
 >> config BR2_PACKAGE_SQLITE_READLINE
 >> -	bool "Command-line editing"
 >> +	bool "readline"
 >> select BR2_PACKAGE_NCURSES
 >> select BR2_PACKAGE_READLINE
 >> help
 >> Enable command-line editing. This requires ncurses and readline.

 > I am not sure I like adding a choice for such a simple thing.
 > Config.in choices are not randomized in our build testing.

 > What about instead dropping the BR2_PACKAGE_SQLITE_READLINE option, and
 > automatically enable readline/libedit support in sqlite when the
 > corresponding packages are enabled ?

 > Peter, what do you think ?

Yes, I also think that would be nicer. The situation with readline is
imho quite like openssl, E.G. we should just enable support for it in
packages if it is present.

-- 
Venlig hilsen,
Peter Korsgaard 

[Buildroot] [PATCH 1/4] package/sqlite: Disable autoreconf

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sat, 23 Jan 2016 11:23:42 +0100, Bernd Kuhls wrote:
> Currently we have no patches for this package, compilation works without
> autoreconf.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/sqlite/sqlite.mk | 3 ---
>  1 file changed, 3 deletions(-)

Patches 1-3 applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com