Skip to content

Commit 60de25b

Browse files
gaulthiergainfelipehuici
authored andcommitted
Provide main() function if configured to do so
We add a config option for enabling the main() function provided by our SQLite glue code. Signed-off-by: Gaulthier Gain <gaulthier.gain@uliege.be> Reviewed-by: Costin Lupu <costin.lupu@cs.pub.ro>
1 parent c667d2a commit 60de25b

File tree

3 files changed

+20
-1
lines changed

3 files changed

+20
-1
lines changed

Config.uk

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
config LIBSQLITE
1+
menuconfig LIBSQLITE
22
bool "SQLite"
33
default y
44
select LIBUKMMAP
55
select UKSYSINFO
66
select LIBNEWLIBC
77
select LIBPTHREAD_EMBEDDED
8+
9+
if LIBSQLITE
10+
config LIBSQLITE_MAIN_FUNCTION
11+
bool "Provide main function"
12+
default y
13+
endif

Makefile.uk

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,15 @@ LIBSQLITE_SUPPRESS_FLAGS += -Wno-unused-parameter -Wno-unused-variable \
7272
LIBSQLITE_CFLAGS-y += $(LIBSQLITE_FLAGS)
7373
LIBSQLITE_CFLAGS-y += $(LIBSQLITE_SUPPRESS_FLAGS)
7474

75+
################################################################################
76+
# Glue code
77+
################################################################################
78+
LIBSQLITE_SRCS-$(CONFIG_LIBSQLITE_MAIN_FUNCTION) += $(LIBSQLITE_BASE)/main.c|unikraft
79+
7580
################################################################################
7681
# SQLite sources
7782
################################################################################
83+
LIBSQLITE_SHELL_FLAGS-y += -Dmain=sqlite_main -Dwmain=sqlite_main
84+
7885
LIBSQLITE_SRCS-y += $(LIBSQLITE_SRC)/shell.c
7986
LIBSQLITE_SRCS-y += $(LIBSQLITE_SRC)/sqlite3.c

main.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
extern int sqlite_main(int argc, char *argv[]);
2+
3+
int main(int argc, char *argv[])
4+
{
5+
return sqlite_main(argc, argv);
6+
}

0 commit comments

Comments
 (0)