Merge oe-devel@oe-devel.bkbits.net:packages

[openembedded.git] / sqlite / sqlite_2.8.9.oe

diff --git a/sqlite/sqlite_2.8.9.oe b/sqlite/sqlite_2.8.9.oe
index 4149c14..7bfec97 100644 (file)
--- a/sqlite/sqlite_2.8.9.oe
+++ b/sqlite/sqlite_2.8.9.oe
@@ -1,29 +1,35 @@
+PR = "r1"
 DESCRIPTION = "An Embeddable SQL Database Engine"
 SECTION = "libs"
 PRIORITY = "optional"
-RDEPENDS = "libc6 readline libncurses5"
-DEPENDS = "virtual/libc base/readline base/ncurses"
+DEPENDS = "readline ncurses"
+LICENSE = "PD"
 
-SRC_URI = http://www.hwaci.com/sw/${PN}/${P}.tar.gz \
-          file://${FILESDIR}/crosscompile.patch;patch=1
+PACKAGES =+ "sqlite-bin"
 
-S = "${WORKDIR}/${PN}"
+FILES_sqlite-bin = "${bindir}"
 
-inherit autotools libtool
+SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \
+           file://crosscompile.patch;patch=1"
 
-EXTRA_OECONF = '--without-tcl --enable-static --enable-shared'
-export config_BUILD_CC=${BUILD_CC}
-export config_BUILD_CFLAGS=${BUILD_CFLAGS}
-export config_TARGET_CC=${CC}
-export config_TARGET_LINK=${CCLD}
-export config_TARGET_CFLAGS=${CFLAGS}
+S = "${WORKDIR}/sqlite"
+
+inherit autotools
+
+EXTRA_OECONF = "--without-tcl --enable-static --enable-shared"
+EXTRA_OEMAKE = "'LIBREADLINE=-L${STAGING_LIBDIR} -lreadline -lncurses' 'LIBTOOL=${S}/${HOST_PREFIX}libtool'"
+export config_BUILD_CC = "${BUILD_CC}"
+export config_BUILD_CFLAGS = "${BUILD_CFLAGS}"
+export config_TARGET_CC = "${CC}"
+export config_TARGET_LINK = "${CCLD}"
+export config_TARGET_CFLAGS = "${CFLAGS}"
 
 do_compile () {
-       oe_runmake 'LIBREADLINE=-L${STAGING_LIBDIR} -lreadline -lncurses'
+       oe_runmake
 }
 
 do_stage() {
-       oe_soinstall .libs/libsqlite.so.0.8.6 ${STAGING_LIBDIR}
+       oe_libinstall -so libsqlite ${STAGING_LIBDIR}
        install -m 0644 sqlite.h ${STAGING_INCDIR}
 }