* [Buildroot] [PATCH v2 1/2] tcl: add host version
@ 2012-01-23 20:23 Arnout Vandecappelle
2012-01-23 20:23 ` [Buildroot] [PATCH v2 2/2] sqlcipher: new package Arnout Vandecappelle
2012-01-24 13:50 ` [Buildroot] [PATCH v2 1/2] tcl: add host version Peter Korsgaard
0 siblings, 2 replies; 5+ messages in thread
From: Arnout Vandecappelle @ 2012-01-23 20:23 UTC (permalink / raw)
To: buildroot
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Also formatting cleanup.
Host version is needed to build sqlcipher.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
v2: More verbose commit message.
---
package/tcl/tcl.mk | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index cf9a409..7bde8c7 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -3,15 +3,20 @@
# TCL8.4
#
#############################################################
-TCL_VERSION:=8.4.19
-TCL_SOURCE:=tcl$(TCL_VERSION)-src.tar.gz
-TCL_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tcl
+TCL_VERSION = 8.4.19
+TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz
+TCL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tcl
TCL_SUBDIR = unix
TCL_CONF_OPT = \
--disable-symbols \
--disable-langinfo \
--disable-framework
+HOST_TCL_CONF_OPT = \
+ --disable-symbols \
+ --disable-langinfo \
+ --disable-framework
+
define TCL_POST_INSTALL_CLEANUP
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libtcl8.4.so
-if [ "$(BR2_PACKAGE_TCL_DEL_ENCODINGS)" = "y" ]; then \
@@ -25,3 +30,4 @@ endef
TCL_POST_INSTALL_TARGET_HOOKS += TCL_POST_INSTALL_CLEANUP
$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
--
1.7.8.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2 2/2] sqlcipher: new package
2012-01-23 20:23 [Buildroot] [PATCH v2 1/2] tcl: add host version Arnout Vandecappelle
@ 2012-01-23 20:23 ` Arnout Vandecappelle
2012-01-24 13:50 ` Peter Korsgaard
2012-01-24 13:50 ` [Buildroot] [PATCH v2 1/2] tcl: add host version Peter Korsgaard
1 sibling, 1 reply; 5+ messages in thread
From: Arnout Vandecappelle @ 2012-01-23 20:23 UTC (permalink / raw)
To: buildroot
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
SQLCipher is a fork of SQLite that adds AES encryption using OpenSSL.
It relies on tcl to generate some of its source code, so host-tcl is
required.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
v2: Added forgotten dependency on host-tcl
---
package/Config.in | 1 +
package/sqlcipher/Config.in | 27 ++++++++++++++++++
package/sqlcipher/sqlcipher.mk | 58 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 86 insertions(+), 0 deletions(-)
create mode 100644 package/sqlcipher/Config.in
create mode 100644 package/sqlcipher/sqlcipher.mk
diff --git a/package/Config.in b/package/Config.in
index f219e37..b245da8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -272,6 +272,7 @@ endmenu
menu "Database"
source "package/berkeleydb/Config.in"
source "package/mysql_client/Config.in"
+source "package/sqlcipher/Config.in"
source "package/sqlite/Config.in"
endmenu
diff --git a/package/sqlcipher/Config.in b/package/sqlcipher/Config.in
new file mode 100644
index 0000000..bf77307
--- /dev/null
+++ b/package/sqlcipher/Config.in
@@ -0,0 +1,27 @@
+config BR2_PACKAGE_SQLCIPHER
+ bool "sqlcipher"
+ depends on !BR2_PACKAGE_SQLITE
+ help
+ SQLCipher is an SQLite extension that provides 256 bits AES
+ encryption of database files. Note that it is a fork of SQLite
+ and they cannot be installed side-by-side.
+ http://sqlcipher.net
+
+config BR2_PACKAGE_SQLCIPHER_READLINE
+ bool "Command-line editing"
+ depends on BR2_PACKAGE_SQLCIPHER
+ select BR2_PACKAGE_NCURSES
+ select BR2_PACKAGE_READLINE
+ help
+ Enable command-line editing. This requires ncurses and readline.
+
+config BR2_PACKAGE_SQLCIPHER_STAT3
+ bool "Additional query optimizations (stat3)"
+ depends on BR2_PACKAGE_SQLCIPHER
+ help
+ Adds additional logic to the ANALYZE command and to the query
+ planner that can help SQLite to choose a better query plan under
+ certain situations.
+
+comment "sqlcipher conflicts with sqlite"
+ depends on BR2_PACKAGE_SQLITE
diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk
new file mode 100644
index 0000000..e3d337a
--- /dev/null
+++ b/package/sqlcipher/sqlcipher.mk
@@ -0,0 +1,58 @@
+#############################################################
+#
+# Sqlcipher extension of sqlite
+# http://sqlcipher.net
+#
+#############################################################
+SQLCIPHER_VERSION = 1.1.9
+SQLCIPHER_SITE = http://github.com/sjlombardo/sqlcipher/tarball/v$(SQLCIPHER_VERSION)
+SQLCIPHER_DEPENDENCIES = openssl host-tcl
+SQLCIPHER_INSTALL_STAGING = YES
+
+SQLCIPHER_CONF_ENV = \
+ CFLAGS+=" $(SQLCIPHER_CFLAGS)" \
+ LDFLAGS+=" $(SQLCIPHER_LDFLAGS)" \
+ TCLSH_CMD=$(HOST_DIR)/usr/bin/tclsh8.4
+
+SQLCIPHER_CONF_OPT = \
+ --enable-threadsafe \
+ --localstatedir=/var
+
+SQLCIPHER_CFLAGS += -DSQLITE_HAS_CODEC # Required according to the README
+SQLCIPHER_LDFLAGS += -lcrypto
+
+ifneq ($(BR2_LARGEFILE),y)
+# the sqlite configure script fails to define SQLITE_DISABLE_LFS when
+# --disable-largefile is passed, breaking the build. Work around it by
+# simply adding it to CFLAGS for configure instead
+SQLCIPHER_CFLAGS += -DSQLITE_DISABLE_LFS
+endif
+
+ifeq ($(BR2_PACKAGE_SQLCIPHER_STAT3),y)
+SQLCIPHER_CFLAGS += -DSQLITE_ENABLE_STAT3
+endif
+
+ifeq ($(BR2_PACKAGE_SQLCIPHER_READLINE),y)
+SQLCIPHER_DEPENDENCIES += ncurses readline
+SQLCIPHER_CONF_OPT += --with-readline-inc="-I$(STAGING_DIR)/usr/include"
+else
+SQLCIPHER_CONF_OPT += --disable-readline
+endif
+
+define SQLCIPHER_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/bin/sqlite3
+ rm -f $(TARGET_DIR)/usr/lib/libsqlite3*
+ rm -f $(TARGET_DIR)/usr/lib/pkgconfig/sqlite3.pc
+ rm -f $(TARGET_DIR)/usr/include/sqlite3*.h
+endef
+
+define SQLCIPHER_UNINSTALL_STAGING_CMDS
+ rm -f $(STAGING_DIR)/usr/bin/sqlite3
+ rm -f $(STAGING_DIR)/usr/lib/libsqlite3*
+ rm -f $(STAGING_DIR)/usr/lib/pkgconfig/sqlite3.pc
+ rm -f $(STAGING_DIR)/usr/include/sqlite3*.h
+endef
+
+$(eval $(call AUTOTARGETS))
+
+
--
1.7.8.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2 1/2] tcl: add host version
2012-01-23 20:23 [Buildroot] [PATCH v2 1/2] tcl: add host version Arnout Vandecappelle
2012-01-23 20:23 ` [Buildroot] [PATCH v2 2/2] sqlcipher: new package Arnout Vandecappelle
@ 2012-01-24 13:50 ` Peter Korsgaard
1 sibling, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2012-01-24 13:50 UTC (permalink / raw)
To: buildroot
>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:
Arnout> From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Arnout> Also formatting cleanup.
Arnout> Host version is needed to build sqlcipher.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2 2/2] sqlcipher: new package
2012-01-23 20:23 ` [Buildroot] [PATCH v2 2/2] sqlcipher: new package Arnout Vandecappelle
@ 2012-01-24 13:50 ` Peter Korsgaard
2012-01-24 14:05 ` Arnout Vandecappelle
0 siblings, 1 reply; 5+ messages in thread
From: Peter Korsgaard @ 2012-01-24 13:50 UTC (permalink / raw)
To: buildroot
>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:
Arnout> From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Arnout> SQLCipher is a fork of SQLite that adds AES encryption using OpenSSL.
Arnout> It relies on tcl to generate some of its source code, so host-tcl is
Arnout> required.
Arnout> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Arnout> ---
Arnout> v2: Added forgotten dependency on host-tcl
Arnout> ---
Arnout> package/Config.in | 1 +
Arnout> package/sqlcipher/Config.in | 27 ++++++++++++++++++
Arnout> package/sqlcipher/sqlcipher.mk | 58 ++++++++++++++++++++++++++++++++++++++++
Arnout> 3 files changed, 86 insertions(+), 0 deletions(-)
Arnout> create mode 100644 package/sqlcipher/Config.in
Arnout> create mode 100644 package/sqlcipher/sqlcipher.mk
Arnout> diff --git a/package/Config.in b/package/Config.in
Arnout> index f219e37..b245da8 100644
Arnout> --- a/package/Config.in
Arnout> +++ b/package/Config.in
Arnout> @@ -272,6 +272,7 @@ endmenu
Arnout> menu "Database"
Arnout> source "package/berkeleydb/Config.in"
Arnout> source "package/mysql_client/Config.in"
Arnout> +source "package/sqlcipher/Config.in"
Arnout> source "package/sqlite/Config.in"
Arnout> endmenu
Arnout> diff --git a/package/sqlcipher/Config.in b/package/sqlcipher/Config.in
Arnout> new file mode 100644
Arnout> index 0000000..bf77307
Arnout> --- /dev/null
Arnout> +++ b/package/sqlcipher/Config.in
Arnout> @@ -0,0 +1,27 @@
Arnout> +config BR2_PACKAGE_SQLCIPHER
Arnout> + bool "sqlcipher"
Arnout> + depends on !BR2_PACKAGE_SQLITE
Arnout> + help
You forgot to select BR2_PACKAGE_OPENSSL. Otherwise it looks good -
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2 2/2] sqlcipher: new package
2012-01-24 13:50 ` Peter Korsgaard
@ 2012-01-24 14:05 ` Arnout Vandecappelle
0 siblings, 0 replies; 5+ messages in thread
From: Arnout Vandecappelle @ 2012-01-24 14:05 UTC (permalink / raw)
To: buildroot
On Tuesday 24 January 2012 14:50:28 Peter Korsgaard wrote:
> You forgot to select BR2_PACKAGE_OPENSSL.
Lesson learnt: don't try to prepare 17 patches for submission in a single
week-end :-)
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-01-24 14:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-23 20:23 [Buildroot] [PATCH v2 1/2] tcl: add host version Arnout Vandecappelle
2012-01-23 20:23 ` [Buildroot] [PATCH v2 2/2] sqlcipher: new package Arnout Vandecappelle
2012-01-24 13:50 ` Peter Korsgaard
2012-01-24 14:05 ` Arnout Vandecappelle
2012-01-24 13:50 ` [Buildroot] [PATCH v2 1/2] tcl: add host version Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.