merge of '4c6f4640a8b948badde77deaaebbfc2c9959ecae'

     and 'e5e5a9814f67f07864e0b56012257f49ace89669'

2 files changed, 46 insertions, 0 deletions

diff --git a/packages/sqlitejdbc/.mtn2git_empty b/packages/sqlitejdbc/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sqlitejdbc/.mtn2git_empty
diff --git a/packages/sqlitejdbc/sqlitejdbc_041.bb b/packages/sqlitejdbc/sqlitejdbc_041.bb
new file mode 100644
index 0000000000..c2ab0f9b23
--- /dev/null
+++ b/packages/sqlitejdbc/sqlitejdbc_041.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "JDBC driver for sqlite"
+LICENSE = "BSD"
+
+AUTHOR = "David Crawshaw"
+HOMEPAGE = "http://www.zentus.com/sqlitejdbc/"
+
+SRC_URI = "\
+	http://www.zentus.com/${PN}/dist/${PN}-v${PV}-src.tgz \
+	"
+
+S = "${WORKDIR}/${PN}-v${PV}"
+
+inherit java-library
+
+DEPENDS = "classpath-native fastjar-native sqlite3 classpath"
+RDEPENDS_${JPN} = "libsqlitejdbc-jni"
+
+do_unpackpost() {
+  mkdir build native
+}
+
+addtask unpackpost after do_unpack before do_patch
+
+do_compile() {
+  javac -sourcepath src -d build `find src/org -name "*.java" -and -not -name "*Nested*"`
+  (cd src && find . -name "*.properties" -exec cp {} ../build/{} \;)
+  fastjar -C build -c -f ${JARFILENAME} .
+
+	gjavah -classpath build -jni -o native/NativeDB.h org.sqlite.NativeDB
+  ${CC} ${CFLAGS} -c -o native/NativeDB.o src/org/sqlite/NativeDB.c -I${STAGING_INCDIR}/classpath -Inative
+  ${CC} ${CFLAGS} ${LDFLAGS} -shared -lsqlite3 -o libsqlitejdbc.so native/NativeDB.o
+
+  ${STRIP} libsqlitejdbc.so
+}
+
+do_install_append() {
+	oe_libinstall -so libsqlitejdbc ${D}${libdir_jni}
+}
+
+do_install_append() {
+	oe_libinstall -so libsqlitejdbc ${STAGING_LIBDIR_JNI}
+}
+
+PACKAGES += "libsqlitejdbc-jni"
+
+FILES_libsqlitejdbc-jni = "${libdir_jni}"