From 5308a1d9f538cc9e2303f49af62336facab7b613 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 5 Nov 2009 18:24:50 +0000
Subject: sqlite3: Cleanups - use BBCLASSEXTEND, drop strange compile bugfix
(now unneeded?), convert to autotools_stage class
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
meta/packages/sqlite/sqlite3-native.inc | 11 -----------
meta/packages/sqlite/sqlite3-native_3.6.7.bb | 1 -
meta/packages/sqlite/sqlite3.inc | 18 +++---------------
meta/packages/sqlite/sqlite3_3.6.16.bb | 2 +-
4 files changed, 4 insertions(+), 28 deletions(-)
delete mode 100644 meta/packages/sqlite/sqlite3-native.inc
delete mode 100644 meta/packages/sqlite/sqlite3-native_3.6.7.bb
(limited to 'meta')
diff --git a/meta/packages/sqlite/sqlite3-native.inc b/meta/packages/sqlite/sqlite3-native.inc
deleted file mode 100644
index 37a394982..000000000
--- a/meta/packages/sqlite/sqlite3-native.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-inherit native
-
-require sqlite3.inc
-
-DEPENDS = "readline-native ncurses-native"
-
-do_install() {
- :
-}
-
-PACKAGES = ""
diff --git a/meta/packages/sqlite/sqlite3-native_3.6.7.bb b/meta/packages/sqlite/sqlite3-native_3.6.7.bb
deleted file mode 100644
index 08208c4c7..000000000
--- a/meta/packages/sqlite/sqlite3-native_3.6.7.bb
+++ /dev/null
@@ -1 +0,0 @@
-require sqlite3-native.inc
diff --git a/meta/packages/sqlite/sqlite3.inc b/meta/packages/sqlite/sqlite3.inc
index d688e75e2..951c25eff 100644
--- a/meta/packages/sqlite/sqlite3.inc
+++ b/meta/packages/sqlite/sqlite3.inc
@@ -9,7 +9,7 @@ SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \
S = "${WORKDIR}/sqlite-${PV}"
-inherit autotools pkgconfig pkgconfig_stage
+inherit autotools_stage pkgconfig pkgconfig_stage
EXTRA_OECONF = "--disable-tcl --enable-shared \
--enable-threadsafe"
@@ -21,20 +21,6 @@ export config_TARGET_LINK = "${CCLD}"
export config_TARGET_CFLAGS = "${CFLAGS}"
export config_TARGET_LFLAGS = "${LDFLAGS}"
-do_compile_prepend() {
- oe_runmake sqlite3.h
- install -m 0644 sqlite3.h ${STAGING_INCDIR}
-}
-
-do_stage() {
- oe_libinstall -so libsqlite3 ${STAGING_LIBDIR}
- install -m 0644 sqlite3.h ${STAGING_INCDIR}
-}
-
-#do_install() {
-# oe_runmake install DESTDIR=${D} prefix=${prefix} exec_prefix=${exec_prefix}
-#}
-
PACKAGES = "libsqlite libsqlite-dev libsqlite-doc sqlite3 sqlite3-dbg"
FILES_sqlite3 = "${bindir}/*"
FILES_libsqlite = "${libdir}/*.so.*"
@@ -42,3 +28,5 @@ FILES_libsqlite-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \
${libdir}/pkgconfig ${includedir}"
FILES_libsqlite-doc = "${docdir} ${mandir} ${infodir}"
AUTO_LIBNAME_PKGS = "libsqlite"
+
+BBCLASSEXTEND = "native"
diff --git a/meta/packages/sqlite/sqlite3_3.6.16.bb b/meta/packages/sqlite/sqlite3_3.6.16.bb
index 5075dd35b..399b6e2a5 100644
--- a/meta/packages/sqlite/sqlite3_3.6.16.bb
+++ b/meta/packages/sqlite/sqlite3_3.6.16.bb
@@ -1,3 +1,3 @@
require sqlite3.inc
-PR = "r1"
+PR = "r2"
--
cgit v1.2.3