merge of '4c6f4640a8b948badde77deaaebbfc2c9959ecae'

     and 'e5e5a9814f67f07864e0b56012257f49ace89669'

5 files changed, 33 insertions, 0 deletions

diff --git a/packages/sqlite/sqlite-native_2.8.17.bb b/packages/sqlite/sqlite-native_2.8.17.bb
new file mode 100644
index 0000000000..a3100fc60c
--- /dev/null
+++ b/packages/sqlite/sqlite-native_2.8.17.bb
@@ -0,0 +1,16 @@
+# This is put at the top to override do_stage later
+inherit native
+
+require sqlite_${PV}.bb
+
+DEPENDS = "readline-native ncurses-native"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/sqlite-${PV}"
+
+S = "${WORKDIR}/sqlite-${PV}"
+
+do_install() {
+	:
+}
+
+PACKAGES = ""
diff --git a/packages/sqlite/sqlite3-native.inc b/packages/sqlite/sqlite3-native.inc
new file mode 100644
index 0000000000..d61551703f
--- /dev/null
+++ b/packages/sqlite/sqlite3-native.inc
@@ -0,0 +1,13 @@
+inherit native
+
+require sqlite3.inc
+
+DEPENDS = "readline-native ncurses-native"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/sqlite3"
+
+do_install() {
+	:
+}
+
+PACKAGES = ""
diff --git a/packages/sqlite/sqlite3-native_3.5.6.bb b/packages/sqlite/sqlite3-native_3.5.6.bb
new file mode 100644
index 0000000000..08208c4c74
--- /dev/null
+++ b/packages/sqlite/sqlite3-native_3.5.6.bb
@@ -0,0 +1 @@
+require sqlite3-native.inc
diff --git a/packages/sqlite/sqlite3.inc b/packages/sqlite/sqlite3.inc
index 68cc3e1c33..93a536e8b6 100644
--- a/packages/sqlite/sqlite3.inc
+++ b/packages/sqlite/sqlite3.inc
@@ -28,6 +28,7 @@ do_compile_prepend() {
 
 do_stage() {
 	oe_libinstall -so libsqlite3 ${STAGING_LIBDIR}
+	install -m 0644 sqlite3.h ${STAGING_INCDIR}
 }
 
 #do_install() {
diff --git a/packages/sqlite/sqlite3_3.5.6.bb b/packages/sqlite/sqlite3_3.5.6.bb
index 53fd96c705..5075dd35b7 100644
--- a/packages/sqlite/sqlite3_3.5.6.bb
+++ b/packages/sqlite/sqlite3_3.5.6.bb
@@ -1 +1,3 @@
 require sqlite3.inc
+
+PR = "r1"