Changes between Version 32 and Version 33 of Packages/SQLite

Timestamp:

06/27/12 06:29:27 (12 years ago)

Author:

C Rempel

Comment:

/* Makefile.sqlite */

Packages/SQLite

@@ -41 +41 @@
 =  Makefile.sqlite  =
 
+
 Just figured out how to get SQLite to compile!
+First, the sqlite command shell executable may NOT be necessary, which bypasses the need to figure out how to implement popen and pclose.  To NOT build the command shell executable, I looked at the Makefile, and built the non sqlite3 make targets.  Namely, lib_intall, and the sqlite3.h.
 
-First, install the rtems-graphics-toolkit/mman_kit, so that SQLite can use shared memory, (shm).
+To avoid sys/mman.h dependency, I looked for sys/mman.h
 
-Second, comment out the references to popen and pclose in rtems-addon-packages/sqlite/src/shell.c
+ $ grep -r "sys\/mman.h" rtems-addon-packages/sqlite
 
-Third, copy the Makefile below into rtems-addon-packages/RTEMS_Makefiles/Makefile.sqlite
+and found that defining SQLITE_OMIT_WAL would eliminate the mmap/munmap dependency.
+
+I copied the Makefile below into rtems-addon-packages/RTEMS_Makefiles/Makefile.sqlite
 {{{
 #
 # Configure/build/install the sqlite library
-# note: comment out the references to popen and pclose in src/shell.c
-# until a reasonable substitution can be found
+# -DSQLITE_OMIT_WAL removes mman dependency
+# -DSQLITE_ENABLE_COLUMN_METADATA taken from sqlite/mkso.sh
+# --disable-largefile makes a library for a 32-bit target on a 64-bit host
+# --disable-amalgamation keeps the source code in separate files for the build
+# copy the public header to the include directory
+# finally, install the library
 
 include ../RTEMS_Makefiles/Makefile.common
 
 all:
-        CFLAGS='-DPROT_READ=0x01' \
-        CFLAGS='-DPROT_WRITE=0x02' \
-        CFLAGS='-DMAP_SHARED=0x001' \
-        CFLAGS='-DSQLITE_OMIT_ALTERTABLE=2 ' \
-        LDFLAGS='-lmmap_kit' \
+        CFLAGS='-DSQLITE_OMIT_WAL=1 DSQLITE_ENABLE_COLUMN_METADATA=1'
         ../sqlite/configure \
                 --prefix=$(exec_prefix) \
@@ -73 +77 @@
                 --libdir=$(exec_prefix)/$(RTEMS_BSP)/lib \
                 --includedir=$(exec_prefix)/$(RTEMS_BSP)/lib/include
-        make 
-        make install
-}}}=  Flags Explained  =
-
-# PROT_READ, PROT_WRITE, and MAP_SHARED all relate to shared memory support, and they're definitions can be found in the FreeBSD sys/mman.h header.
-# The SQLite omit altertable was defined to enhance security and reduce code size.
-# The mmap_kit was linked to provide definitions for mmap and munmap for shared memory support.
-=  Configurations Explained  =
-
-# The build had to be defined because the June 2012 sqlite developer repository couldn't recognize the build of my laptop.
-# As RTEMS is mostly on 32-bit (or smaller) architectures, I disabled largfile support.  # Cross-thread connections looked useful for RTEMS, so I put it in there.
-# I disabled tcl and readline support to reduce dependencies, and 
-# I disabled amalgamation to isolate porting issues.
+        make sqlite3.h libsqlite3.la
+        cp sqlite3.h $(exec_prefix)/$(RTEMS_BSP)/lib/include
+        make lib_install
+}}}
 =  Testing Ideas  =