diff options
author | Armin Kuster <akuster808@gmail.com> | 2017-10-26 13:25:14 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-03-01 16:10:35 -0800 |
commit | 036b3e794650cfc92f2f983d860ce93575198b57 (patch) | |
tree | a3c238eefa863226c5d5b3e4fc496198a0f5cd8f /meta-oe/recipes-support | |
parent | b836c5b810898cf51baa012c8debe816a715717a (diff) | |
download | meta-openembedded-036b3e794650cfc92f2f983d860ce93575198b57.tar.gz |
sqlite: move to recipes-dbs
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
5 files changed, 0 insertions, 157 deletions
diff --git a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/0001-shell.c-Fix-format-not-a-string-literal-warning.patch b/meta-oe/recipes-support/sqlite/sqlite-2.8.17/0001-shell.c-Fix-format-not-a-string-literal-warning.patch deleted file mode 100644 index c5d7c0c81..000000000 --- a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/0001-shell.c-Fix-format-not-a-string-literal-warning.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 443980ddc82fb40e2e1f9544f2be169bd23dd246 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 17 Jun 2017 16:49:24 -0700 | ||
4 | Subject: [PATCH] shell.c: Fix format not a string literal warning | ||
5 | |||
6 | src/shell.c:695:20: error: format not a string literal and no format arguments [-Werror=format-security] | ||
7 | | fprintf(stderr,zHelp); | ||
8 | | ^~~~~ | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | src/shell.c | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/src/shell.c b/src/shell.c | ||
18 | index bb46c49..3c6fe0f 100644 | ||
19 | --- a/src/shell.c | ||
20 | +++ b/src/shell.c | ||
21 | @@ -692,7 +692,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){ | ||
22 | }else | ||
23 | |||
24 | if( c=='h' && strncmp(azArg[0], "help", n)==0 ){ | ||
25 | - fprintf(stderr,zHelp); | ||
26 | + fprintf(stderr, "%s", zHelp); | ||
27 | }else | ||
28 | |||
29 | if( c=='i' && strncmp(azArg[0], "indices", n)==0 && nArg>1 ){ | ||
30 | -- | ||
31 | 2.13.1 | ||
32 | |||
diff --git a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch b/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch deleted file mode 100644 index 914422f1d..000000000 --- a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | diff -urN sqlite-2.8.17.orig/main.mk sqlite-2.8.17/main.mk | ||
2 | --- sqlite-2.8.17.orig/main.mk 2005-04-23 22:43:23.000000000 +0000 | ||
3 | +++ sqlite-2.8.17/main.mk 2009-04-02 20:10:36.000000000 +0000 | ||
4 | @@ -139,7 +139,7 @@ | ||
5 | # This is the default Makefile target. The objects listed here | ||
6 | # are what get build when you type just "make" with no arguments. | ||
7 | # | ||
8 | -all: sqlite.h config.h libsqlite.a sqlite$(EXE) | ||
9 | +all: sqlite.h config.h libsqlite.so sqlite$(EXE) | ||
10 | |||
11 | # Generate the file "last_change" which contains the date of change | ||
12 | # of the most recently modified source code file | ||
13 | @@ -148,13 +148,12 @@ | ||
14 | cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \ | ||
15 | | awk '{print $$5,$$6}' >last_change | ||
16 | |||
17 | -libsqlite.a: $(LIBOBJ) | ||
18 | - $(AR) libsqlite.a $(LIBOBJ) | ||
19 | - $(RANLIB) libsqlite.a | ||
20 | - | ||
21 | -sqlite$(EXE): $(TOP)/src/shell.c libsqlite.a sqlite.h | ||
22 | - $(TCCX) $(READLINE_FLAGS) -o sqlite$(EXE) $(TOP)/src/shell.c \ | ||
23 | - libsqlite.a $(LIBREADLINE) $(THREADLIB) | ||
24 | +libsqlite.so: $(LIBOBJ) | ||
25 | + $(CC) $(LDFLAGS) -shared -o libsqlite.so -Wl,-soname,libsqlite.so.0 $(LIBOBJ) | ||
26 | + | ||
27 | +sqlite$(EXE): $(TOP)/src/shell.c libsqlite.so sqlite.h | ||
28 | + $(TCCX) $(LDFLAGS) $(READLINE_FLAGS) -o sqlite$(EXE) $(TOP)/src/shell.c \ | ||
29 | + -lsqlite $(LIBREADLINE) $(THREADLIB) | ||
30 | |||
31 | sqlite_analyzer$(EXE): $(TOP)/src/tclsqlite.c libsqlite.a $(TESTSRC) \ | ||
32 | $(TOP)/tool/spaceanal.tcl | ||
diff --git a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch b/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch deleted file mode 100644 index b84b6486e..000000000 --- a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | diff -bur sqlite-2.8.17~orig/main.mk sqlite-2.8.17/main.mk | ||
2 | --- sqlite-2.8.17~orig/main.mk 2006-02-13 04:09:33.000000000 -0600 | ||
3 | +++ sqlite-2.8.17/main.mk 2006-02-13 04:15:42.000000000 -0600 | ||
4 | @@ -58,7 +58,7 @@ | ||
5 | expr.o func.o hash.o insert.o \ | ||
6 | main.o opcodes.o os.o pager.o parse.o pragma.o printf.o random.o \ | ||
7 | select.o table.o tokenize.o trigger.o update.o util.o \ | ||
8 | - vacuum.o vdbe.o vdbeaux.o where.o tclsqlite.o | ||
9 | + vacuum.o vdbe.o vdbeaux.o where.o | ||
10 | |||
11 | # All of the source code files. | ||
12 | # | ||
13 | @@ -91,7 +91,6 @@ | ||
14 | $(TOP)/src/sqlite.h.in \ | ||
15 | $(TOP)/src/sqliteInt.h \ | ||
16 | $(TOP)/src/table.c \ | ||
17 | - $(TOP)/src/tclsqlite.c \ | ||
18 | $(TOP)/src/tokenize.c \ | ||
19 | $(TOP)/src/trigger.c \ | ||
20 | $(TOP)/src/update.c \ | ||
diff --git a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/sqlite.pc b/meta-oe/recipes-support/sqlite/sqlite-2.8.17/sqlite.pc deleted file mode 100644 index 6bc742eec..000000000 --- a/meta-oe/recipes-support/sqlite/sqlite-2.8.17/sqlite.pc +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | # Package Information for pkg-config | ||
2 | |||
3 | prefix=/usr | ||
4 | exec_prefix=${prefix} | ||
5 | libdir=${exec_prefix}/lib | ||
6 | includedir=${prefix}/include | ||
7 | |||
8 | Name: SQLite | ||
9 | Description: SQL database engine | ||
10 | Version: 2.8.17 | ||
11 | Libs: -L${libdir} -lsqlite | ||
12 | Cflags: -I${includedir} | ||
diff --git a/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb b/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb deleted file mode 100644 index 501c0e3e7..000000000 --- a/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | SUMMARY = "An Embeddable SQL Database Engine" | ||
2 | HOMEPAGE = "http://www.sqlite.org/" | ||
3 | SECTION = "libs" | ||
4 | DEPENDS = "readline ncurses" | ||
5 | LICENSE = "PD" | ||
6 | LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=10;md5=e98469a8efa024a38ad5b2e4b92f4a96" | ||
7 | |||
8 | PR = "r7" | ||
9 | |||
10 | SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \ | ||
11 | file://mainmk_build_dynamic.patch \ | ||
12 | file://mainmk_no_tcl.patch \ | ||
13 | file://sqlite.pc \ | ||
14 | file://0001-shell.c-Fix-format-not-a-string-literal-warning.patch \ | ||
15 | " | ||
16 | |||
17 | SOURCES = "attach.o auth.o btree.o btree_rb.o build.o copy.o date.o delete.o \ | ||
18 | expr.o func.o hash.o insert.o main.o opcodes.o os.o pager.o \ | ||
19 | parse.o pragma.o printf.o random.o select.o table.o tokenize.o \ | ||
20 | trigger.o update.o util.o vacuum.o vdbe.o vdbeaux.o where.o" | ||
21 | |||
22 | inherit autotools pkgconfig | ||
23 | |||
24 | do_configure() { | ||
25 | echo "main.mk is patched, no need to configure" | ||
26 | # make pkgconfig.bbclass pick this up | ||
27 | cp ${WORKDIR}/sqlite.pc ${S} | ||
28 | } | ||
29 | |||
30 | do_compile() { | ||
31 | oe_runmake -f ${S}/Makefile.linux-gcc \ | ||
32 | TOP="${S}" \ | ||
33 | BCC="${BUILD_CC}" \ | ||
34 | TCC="${CC}" \ | ||
35 | OPTS="-fPIC -D'INTPTR_TYPE=int'" \ | ||
36 | TCL_FLAGS= LIBTCL= \ | ||
37 | READLINE_FLAGS="-DHAVE_READLINE=1 -I${STAGING_INCDIR}" \ | ||
38 | LIBREADLINE="-L. -L${STAGING_LIBDIR} -lreadline -lncurses" | ||
39 | } | ||
40 | |||
41 | do_install() { | ||
42 | install -d ${D}${libdir} ${D}${bindir} | ||
43 | install sqlite ${D}${bindir} | ||
44 | install -m 0755 libsqlite.so ${D}${libdir}/libsqlite.so.0.8.6 | ||
45 | ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so | ||
46 | ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0 | ||
47 | ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0.8 | ||
48 | install -d ${D}${includedir} | ||
49 | install -m 0644 sqlite.h ${D}${includedir}/sqlite.h | ||
50 | install -d ${D}${libdir}/pkgconfig | ||
51 | install -m 0644 ${S}/sqlite.pc ${D}${libdir}/pkgconfig/sqlite.pc | ||
52 | } | ||
53 | |||
54 | PACKAGES += "${PN}-bin" | ||
55 | FILES_${PN}-bin = "${bindir}/*" | ||
56 | FILES_${PN} = "${libdir}/*.so.*" | ||
57 | |||
58 | SRC_URI[md5sum] = "838dbac20b56d2c4292e98848505a05b" | ||
59 | SRC_URI[sha256sum] = "3f35ebfb67867fb5b583a03e480f900206af637efe7179b32294a6a0cf806f37" | ||
60 | |||
61 | BBCLASSEXTEND = "native" | ||