diff options
| author | Yu Ke <ke.yu@intel.com> | 2011-05-08 21:09:26 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-11 16:41:53 +0100 |
| commit | 03439a38e367bb817e7f332b617df289c73b847b (patch) | |
| tree | 3c529746bea5d48cdf8325821d9b41c5c51f7272 /meta/recipes-support | |
| parent | 4c96cce0a0c81916f9f8f144515855e31a8472bf (diff) | |
| download | poky-03439a38e367bb817e7f332b617df289c73b847b.tar.gz | |
sqlite: upgrade from 3.7.5 to 3.7.6.2
- also remove the libtool.patch since it is already in the release version
- update the LIC_FILES_CHKSUM, the license is not changed, just use
sqlite3.h as more appropriate license file. the original sqlite3.c
is actually not point to license content.
(From OE-Core rev: 195d907986f19131d8f545b7473a676553c96028)
Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/sqlite/sqlite3.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-support/sqlite/sqlite3/libtool.patch | 25 | ||||
| -rw-r--r-- | meta/recipes-support/sqlite/sqlite3_3.7.5.bb | 10 | ||||
| -rw-r--r-- | meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb | 10 |
4 files changed, 10 insertions, 40 deletions
diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc index 92c4930ce7..d8ef8dc2c5 100644 --- a/meta/recipes-support/sqlite/sqlite3.inc +++ b/meta/recipes-support/sqlite/sqlite3.inc | |||
| @@ -6,11 +6,6 @@ DEPENDS = "readline ncurses tcl-native" | |||
| 6 | DEPENDS_virtclass-native = "tcl-native" | 6 | DEPENDS_virtclass-native = "tcl-native" |
| 7 | LICENSE = "PD" | 7 | LICENSE = "PD" |
| 8 | 8 | ||
| 9 | SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \ | ||
| 10 | file://libtool.patch" | ||
| 11 | |||
| 12 | S = "${WORKDIR}/sqlite-${PV}" | ||
| 13 | |||
| 14 | inherit autotools pkgconfig | 9 | inherit autotools pkgconfig |
| 15 | 10 | ||
| 16 | EXTRA_OECONF = "--disable-tcl --enable-shared --enable-threadsafe" | 11 | EXTRA_OECONF = "--disable-tcl --enable-shared --enable-threadsafe" |
diff --git a/meta/recipes-support/sqlite/sqlite3/libtool.patch b/meta/recipes-support/sqlite/sqlite3/libtool.patch deleted file mode 100644 index ccf9993ed2..0000000000 --- a/meta/recipes-support/sqlite/sqlite3/libtool.patch +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | Index: sqlite-3.2.1/Makefile.in | ||
| 2 | =================================================================== | ||
| 3 | --- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100 | ||
| 4 | +++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200 | ||
| 5 | @@ -15,7 +15,10 @@ | ||
| 6 | # The toplevel directory of the source tree. This is the directory | ||
| 7 | # that contains this "Makefile.in" and the "configure.in" script. | ||
| 8 | # | ||
| 9 | -TOP = @srcdir@ | ||
| 10 | +TOP = $(srcdir) | ||
| 11 | +srcdir = @srcdir@ | ||
| 12 | +top_srcdir = @top_srcdir@ | ||
| 13 | +top_builddir = . | ||
| 14 | |||
| 15 | # C Compiler and options for use in building executables that | ||
| 16 | # will run on the platform that is doing the build. | ||
| 17 | @@ -96,7 +99,7 @@ | ||
| 18 | exec_prefix = @exec_prefix@ | ||
| 19 | libdir = @libdir@ | ||
| 20 | INSTALL = @INSTALL@ | ||
| 21 | -LIBTOOL = ./libtool | ||
| 22 | +LIBTOOL = @LIBTOOL@ | ||
| 23 | ALLOWRELEASE = @ALLOWRELEASE@ | ||
| 24 | |||
| 25 | # libtool compile/link/install | ||
diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.5.bb b/meta/recipes-support/sqlite/sqlite3_3.7.5.bb deleted file mode 100644 index 212d9e2a14..0000000000 --- a/meta/recipes-support/sqlite/sqlite3_3.7.5.bb +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | require sqlite3.inc | ||
| 2 | |||
| 3 | LIC_FILES_CHKSUM = "file://sqlite3.c;endline=19;md5=c1b8048b783961c3ba387c43fd955dc6" | ||
| 4 | |||
| 5 | SRC_URI = "http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz" | ||
| 6 | S = "${WORKDIR}/sqlite-autoconf-3070500" | ||
| 7 | PR = "r0" | ||
| 8 | |||
| 9 | SRC_URI[md5sum] = "a9604a82613ade2e7f4c303f233e477f" | ||
| 10 | SRC_URI[sha256sum] = "cb5b86926ec9f65882b2dddd244f2d620337d911ec73411863f77e48cf6a2f94" | ||
diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb b/meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb new file mode 100644 index 0000000000..34d1653c6e --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | require sqlite3.inc | ||
| 2 | |||
| 3 | LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0" | ||
| 4 | |||
| 5 | SRC_URI = "http://www.sqlite.org/sqlite-autoconf-3070602.tar.gz" | ||
| 6 | S = "${WORKDIR}/sqlite-autoconf-3070602" | ||
| 7 | PR = "r0" | ||
| 8 | |||
| 9 | SRC_URI[md5sum] = "f16c08617968b4087b3d591fd575f59f" | ||
| 10 | SRC_URI[sha256sum] = "53aa66f30d8ff87230d4173b7979814432b8084da77fba05992223f76593fc81" | ||
