d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Promote SQLite3 as a privatelib as it will also be used by mandoc

Browse Source 
While here ensure sqlite3 is using pread(2) and enable the suppot for FTS4
This commit is contained in:
Baptiste Daroussin 2014-11-22 19:44:49 +00:00
parent 912bdb4db7
commit 362492e53e
14 changed files with 68 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Makefile
View File

@ -90,6 +90,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
${_libsmb} \
${_libsmdb} \
${_libsmutil} \
libsqlite3 \
libstand \
libstdbuf \
libstdthreads \

38
lib/libsqlite3/Makefile Normal file
View File

@ -0,0 +1,38 @@
# $FreeBSD$
PRIVATELIB= yes
LIB= sqlite3
SHLIB_MAJOR?= 0
SRCS= sqlite3.c
SQLITE= ${.CURDIR}/../../contrib/sqlite3
.PATH: ${SQLITE}
WARNS= 3
CFLAGS+= -I${SQLITE} \
-DSTDC_HEADERS=1 \
-DHAVE_SYS_TYPES_H=1 \
-DHAVE_SYS_STAT_H=1 \
-DUSE_PREAD=1 \
-DHAVE_STDLIB_H=1 \
-DHAVE_STRING_H=1 \
-DHAVE_MEMORY_H=1 \
-DHAVE_STRINGS_H=1 \
-DHAVE_INTTYPES_H=1 \
-DHAVE_STDINT_H=1 \
-DHAVE_UNISTD_H=1 \
-DHAVE_DLFCN_H=1 \
-DHAVE_USLEEP=1 \
-DHAVE_LOCALTIME_R=1 \
-DHAVE_GMTIME_R=1 \
-DHAVE_DECL_STRERROR_R=1 \
-DHAVE_STRERROR_R=1 \
-DHAVE_POSIX_FALLOCATE=1 \
-D_REENTRANT=1 \
-DSQLITE_THREADSAFE=1 \
-DSQLITE_ENABLE_FTS3 \
-DSQLITE_ENABLE_FTS4 \
-DSQLITE_ENABLE_RTREE
.include <bsd.lib.mk>

3
usr.bin/svn/Makefile.inc
View File

@ -13,7 +13,6 @@ SVNLITE?= lite
SVNDIR= ${.CURDIR}/../../../contrib/subversion/subversion
APRU= ${.CURDIR}/../../../contrib/apr-util
APR= ${.CURDIR}/../../../contrib/apr
SQLITE= ${.CURDIR}/../../../contrib/sqlite3
WARNS?= 0 # defintely not warns friendly
.if exists(${.CURDIR}/../../Makefile.inc)
@ -22,7 +21,6 @@ WARNS?= 0 # defintely not warns friendly
LIBAPRDIR= ${.OBJDIR}/../lib/libapr
LIBAPR_UTILDIR= ${.OBJDIR}/../lib/libapr_util
LIBSQLITEDIR= ${.OBJDIR}/../lib/libsqlite3
LIBSERFDIR= ${.OBJDIR}/../lib/libserf
LIBSVN_CLIENTDIR= ${.OBJDIR}/../lib/libsvn_client
@ -41,7 +39,6 @@ LIBSVN_WCDIR= ${.OBJDIR}/../lib/libsvn_wc
LIBAPR= ${LIBAPRDIR}/libapr.a
LIBAPR_UTIL= ${LIBAPR_UTILDIR}/libapr-util.a
LIBSQLITE= ${LIBSQLITEDIR}/libsqlite3.a
LIBSERF= ${LIBSERFDIR}/libserf.a
LIBSVN_CLIENT= ${LIBSVN_CLIENTDIR}/libsvn_client.a

2
usr.bin/svn/lib/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
SUBDIR= libapr libapr_util libserf libsqlite3 \
SUBDIR= libapr libapr_util libserf \
libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_fs_fs \
libsvn_fs_util libsvn_ra libsvn_ra_local libsvn_ra_serf \
libsvn_ra_svn libsvn_repos libsvn_subr libsvn_wc

25
usr.bin/svn/lib/libsqlite3/Makefile
View File

@ -1,25 +0,0 @@
# $FreeBSD$
.include "${.CURDIR}/../Makefile.inc"
INTERNALLIB= yes
LIB= sqlite3
SRCS= sqlite3.c
.PATH: ${SQLITE}
CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR} \
-I${APR}/include/arch/unix -I${APR}/include
CFLAGS+= -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \
-DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 \
-DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 \
-DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DHAVE_USLEEP=1 \
-DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 \
-DHAVE_DECL_STRERROR_R=1 -DHAVE_STRERROR_R=1 \
-DHAVE_READLINE=1 -DHAVE_POSIX_FALLOCATE=1 \
-I${SQLITE} -D_REENTRANT=1 -DSQLITE_THREADSAFE=1 \
-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
.include <bsd.lib.mk>

5
usr.bin/svn/svn/Makefile
View File

@ -41,15 +41,16 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \
-L${LIBAPR_UTILDIR} -lapr-util \
-lbsdxml \
-L${LIBAPRDIR} -lapr \
-L${LIBSQLITEDIR} -lsqlite3 \
${LDSQLITE3} \
-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \
${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \
${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \
${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
USEPRIVATELIB= sqlite3
CLEANFILES+= svnlite.1
.if(defined(ORGANIZATION) && !empty(ORGANIZATION))

6
usr.bin/svn/svnadmin/Makefile
View File

@ -27,11 +27,13 @@ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \
-L${LIBAPR_UTILDIR} -lapr-util \
-lbsdxml \
-L${LIBAPRDIR} -lapr \
-L${LIBSQLITEDIR} -lsqlite3 \
${LDSQLITE3} \
-lz -lcrypt -lpthread
DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD}
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD}
USEPRIVATELIB= sqlite3
.include <bsd.prog.mk>

5
usr.bin/svn/svndumpfilter/Makefile
View File

@ -27,11 +27,12 @@ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \
-L${LIBAPR_UTILDIR} -lapr-util \
-lbsdxml \
-L${LIBAPRDIR} -lapr \
-L${LIBSQLITEDIR} -lsqlite3 \
${LDSQLITE3} \
-lz -lcrypt -lpthread
DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD}
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD}
USEPRIVATELIB= sqlite3
.include <bsd.prog.mk>

5
usr.bin/svn/svnlook/Makefile
View File

@ -28,11 +28,12 @@ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \
-L${LIBAPR_UTILDIR} -lapr-util \
-lbsdxml \
-L${LIBAPRDIR} -lapr \
-L${LIBSQLITEDIR} -lsqlite3 \
${LDSQLITE3} \
-lz -lcrypt -lpthread
DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD}
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD}
USEPRIVATELIB= sqlite3
.include <bsd.prog.mk>

5
usr.bin/svn/svnmucc/Makefile
View File

@ -33,13 +33,14 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \
-L${LIBAPR_UTILDIR} -lapr-util \
-lbsdxml \
-L${LIBAPRDIR} -lapr \
-L${LIBSQLITEDIR} -lsqlite3 \
${LDSQLITE3} \
-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
DPADD= ${LIBSVN_CLIENT} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} \
${LIBSVN_RA_SERF} ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} \
${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} \
${LIBAPR_UTIL} ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} \
${LIBAPR_UTIL} ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} \
${LIBCRYPT} ${LIBMAGIC} ${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
USEPRIVATELIB= sqlite3
.include <bsd.prog.mk>

5
usr.bin/svn/svnrdump/Makefile
View File

@ -35,14 +35,15 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \
-L${LIBAPR_UTILDIR} -lapr-util \
-lbsdxml \
-L${LIBAPRDIR} -lapr \
-L${LIBSQLITEDIR} -lsqlite3 \
${LDSQLITE3} \
-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \
${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \
${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \
${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
USEPRIVATELIB= sqlite3
.include <bsd.prog.mk>

5
usr.bin/svn/svnserve/Makefile
View File

@ -32,13 +32,14 @@ LDADD= -L${LIBSVN_RADIR} -lsvn_ra \
-L${LIBAPR_UTILDIR} -lapr-util \
-lbsdxml \
-L${LIBAPRDIR} -lapr \
-L${LIBSQLITEDIR} -lsqlite3 \
${LDSQLITE3} \
-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
DPADD= ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \
${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
USEPRIVATELIB= sqlite3
.include <bsd.prog.mk>

5
usr.bin/svn/svnsync/Makefile
View File

@ -32,13 +32,14 @@ LDADD= -L${LIBSVN_RADIR} -lsvn_ra \
-L${LIBAPR_UTILDIR} -lapr-util \
-lbsdxml \
-L${LIBAPRDIR} -lapr \
-L${LIBSQLITEDIR} -lsqlite3 \
${LDSQLITE3} \
-lz -lcrypt -lmagic -lcrypto -lssl -lpthread
DPADD= ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \
${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
USEPRIVATELIB= sqlite3
.include <bsd.prog.mk>

5
usr.bin/svn/svnversion/Makefile
View File

@ -25,11 +25,12 @@ LDADD= -L${LIBSVN_WCDIR} -lsvn_wc \
-L${LIBAPR_UTILDIR} -lapr-util \
-lbsdxml \
-L${LIBAPRDIR} -lapr \
-L${LIBSQLITEDIR} -lsqlite3 \
${LDSQLITE3} \
-lz -lcrypt -lpthread
DPADD= ${LIBSVN_WC} ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} \
${LIBSERF} ${LIBAPR_UTIL} ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} \
${LIBSERF} ${LIBAPR_UTIL} ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} \
${LIBZ} ${LIBCRYPT} ${LIBPTHREAD}
USEPRIVATELIB= sqlite3
.include <bsd.prog.mk>