diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-06-12 14:45:27 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-06-12 14:45:27 +0000 |
| commit | b1f4d34f8541f039d72d423223c91e32540a2fc5 (patch) | |
| tree | c50f34a595a58cb31a25d96727c3e2c9c27c0a91 /packages/sqlite | |
| parent | 10013e9ed4e79a2f6ca0ceb6451787aaa47c46e5 (diff) | |
| parent | b655c71aac44af6eab2a52774ea810a945592cee (diff) | |
merge of '30c320b2f51c86226580e5bbf68fa8b0896a0655'
and '8dfee9b2427785432e4161eb7cc749155230e08e'
Diffstat (limited to 'packages/sqlite')
| -rw-r--r-- | packages/sqlite/sqlite3-3.3.17/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/sqlite/sqlite3-3.3.17/libtool.patch | 25 | ||||
| -rw-r--r-- | packages/sqlite/sqlite3.inc | 5 | ||||
| -rw-r--r-- | packages/sqlite/sqlite3_3.3.12.bb | 3 | ||||
| -rw-r--r-- | packages/sqlite/sqlite3_3.3.13.bb | 3 | ||||
| -rw-r--r-- | packages/sqlite/sqlite3_3.3.17.bb | 3 |
6 files changed, 34 insertions, 5 deletions
diff --git a/packages/sqlite/sqlite3-3.3.17/.mtn2git_empty b/packages/sqlite/sqlite3-3.3.17/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sqlite/sqlite3-3.3.17/.mtn2git_empty diff --git a/packages/sqlite/sqlite3-3.3.17/libtool.patch b/packages/sqlite/sqlite3-3.3.17/libtool.patch new file mode 100644 index 0000000000..ccf9993ed2 --- /dev/null +++ b/packages/sqlite/sqlite3-3.3.17/libtool.patch @@ -0,0 +1,25 @@ +Index: sqlite-3.2.1/Makefile.in +=================================================================== +--- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100 ++++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200 +@@ -15,7 +15,10 @@ + # The toplevel directory of the source tree. This is the directory + # that contains this "Makefile.in" and the "configure.in" script. + # +-TOP = @srcdir@ ++TOP = $(srcdir) ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++top_builddir = . + + # C Compiler and options for use in building executables that + # will run on the platform that is doing the build. +@@ -96,7 +99,7 @@ + exec_prefix = @exec_prefix@ + libdir = @libdir@ + INSTALL = @INSTALL@ +-LIBTOOL = ./libtool ++LIBTOOL = @LIBTOOL@ + ALLOWRELEASE = @ALLOWRELEASE@ + + # libtool compile/link/install diff --git a/packages/sqlite/sqlite3.inc b/packages/sqlite/sqlite3.inc index 01290c2e41..68cc3e1c33 100644 --- a/packages/sqlite/sqlite3.inc +++ b/packages/sqlite/sqlite3.inc @@ -5,9 +5,8 @@ DEPENDS = "readline ncurses" LICENSE = "PD" SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \ - file://cross-compile.patch;patch=1 \ - file://libtool.patch;patch=1 \ - file://ldflags.patch;patch=1" + file://libtool.patch;patch=1" + S = "${WORKDIR}/sqlite-${PV}" inherit autotools pkgconfig diff --git a/packages/sqlite/sqlite3_3.3.12.bb b/packages/sqlite/sqlite3_3.3.12.bb index 59c13ee01f..3d642f0ffc 100644 --- a/packages/sqlite/sqlite3_3.3.12.bb +++ b/packages/sqlite/sqlite3_3.3.12.bb @@ -1,2 +1,3 @@ require sqlite3.inc -PR = "r0" +PR = "r1" +SRC_URI += "file://cross-compile.patch;patch=1 file://ldflags.patch;patch=1" diff --git a/packages/sqlite/sqlite3_3.3.13.bb b/packages/sqlite/sqlite3_3.3.13.bb index 59c13ee01f..3d642f0ffc 100644 --- a/packages/sqlite/sqlite3_3.3.13.bb +++ b/packages/sqlite/sqlite3_3.3.13.bb @@ -1,2 +1,3 @@ require sqlite3.inc -PR = "r0" +PR = "r1" +SRC_URI += "file://cross-compile.patch;patch=1 file://ldflags.patch;patch=1" diff --git a/packages/sqlite/sqlite3_3.3.17.bb b/packages/sqlite/sqlite3_3.3.17.bb new file mode 100644 index 0000000000..cee00874bd --- /dev/null +++ b/packages/sqlite/sqlite3_3.3.17.bb @@ -0,0 +1,3 @@ +require sqlite3.inc +PR = "r0" + |