From owner-svn-src-all@FreeBSD.ORG Sat Nov 22 19:44:54 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0F65BB51; Sat, 22 Nov 2014 19:44:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EDA6CBA1; Sat, 22 Nov 2014 19:44:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAMJirBe059383; Sat, 22 Nov 2014 19:44:53 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAMJionc059362; Sat, 22 Nov 2014 19:44:50 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201411221944.sAMJionc059362@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 22 Nov 2014 19:44:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274885 - in head: lib lib/libsqlite3 usr.bin/svn usr.bin/svn/lib usr.bin/svn/lib/libsqlite3 usr.bin/svn/svn usr.bin/svn/svnadmin usr.bin/svn/svndumpfilter usr.bin/svn/svnlook usr.bin/s... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 19:44:54 -0000 Author: bapt Date: Sat Nov 22 19:44:49 2014 New Revision: 274885 URL: https://svnweb.freebsd.org/changeset/base/274885 Log: Promote SQLite3 as a privatelib as it will also be used by mandoc While here ensure sqlite3 is using pread(2) and enable the suppot for FTS4 Added: head/lib/libsqlite3/ - copied from r274850, head/usr.bin/svn/lib/libsqlite3/ Deleted: head/usr.bin/svn/lib/libsqlite3/ Modified: head/lib/Makefile head/lib/libsqlite3/Makefile head/usr.bin/svn/Makefile.inc head/usr.bin/svn/lib/Makefile head/usr.bin/svn/svn/Makefile head/usr.bin/svn/svnadmin/Makefile head/usr.bin/svn/svndumpfilter/Makefile head/usr.bin/svn/svnlook/Makefile head/usr.bin/svn/svnmucc/Makefile head/usr.bin/svn/svnrdump/Makefile head/usr.bin/svn/svnserve/Makefile head/usr.bin/svn/svnsync/Makefile head/usr.bin/svn/svnversion/Makefile Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Sat Nov 22 19:18:08 2014 (r274884) +++ head/lib/Makefile Sat Nov 22 19:44:49 2014 (r274885) @@ -90,6 +90,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} \ + libsqlite3 \ libstand \ libstdbuf \ libstdthreads \ Modified: head/lib/libsqlite3/Makefile ============================================================================== --- head/usr.bin/svn/lib/libsqlite3/Makefile Sat Nov 22 13:06:47 2014 (r274850) +++ head/lib/libsqlite3/Makefile Sat Nov 22 19:44:49 2014 (r274885) @@ -1,25 +1,38 @@ # $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 +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 Modified: head/usr.bin/svn/Makefile.inc ============================================================================== --- head/usr.bin/svn/Makefile.inc Sat Nov 22 19:18:08 2014 (r274884) +++ head/usr.bin/svn/Makefile.inc Sat Nov 22 19:44:49 2014 (r274885) @@ -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 friendl 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_ 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 Modified: head/usr.bin/svn/lib/Makefile ============================================================================== --- head/usr.bin/svn/lib/Makefile Sat Nov 22 19:18:08 2014 (r274884) +++ head/usr.bin/svn/lib/Makefile Sat Nov 22 19:44:49 2014 (r274885) @@ -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 Modified: head/usr.bin/svn/svn/Makefile ============================================================================== --- head/usr.bin/svn/svn/Makefile Sat Nov 22 19:18:08 2014 (r274884) +++ head/usr.bin/svn/svn/Makefile Sat Nov 22 19:44:49 2014 (r274885) @@ -41,15 +41,16 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_clien -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)) Modified: head/usr.bin/svn/svnadmin/Makefile ============================================================================== --- head/usr.bin/svn/svnadmin/Makefile Sat Nov 22 19:18:08 2014 (r274884) +++ head/usr.bin/svn/svnadmin/Makefile Sat Nov 22 19:44:49 2014 (r274885) @@ -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 Modified: head/usr.bin/svn/svndumpfilter/Makefile ============================================================================== --- head/usr.bin/svn/svndumpfilter/Makefile Sat Nov 22 19:18:08 2014 (r274884) +++ head/usr.bin/svn/svndumpfilter/Makefile Sat Nov 22 19:44:49 2014 (r274885) @@ -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 Modified: head/usr.bin/svn/svnlook/Makefile ============================================================================== --- head/usr.bin/svn/svnlook/Makefile Sat Nov 22 19:18:08 2014 (r274884) +++ head/usr.bin/svn/svnlook/Makefile Sat Nov 22 19:44:49 2014 (r274885) @@ -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 Modified: head/usr.bin/svn/svnmucc/Makefile ============================================================================== --- head/usr.bin/svn/svnmucc/Makefile Sat Nov 22 19:18:08 2014 (r274884) +++ head/usr.bin/svn/svnmucc/Makefile Sat Nov 22 19:44:49 2014 (r274885) @@ -33,13 +33,14 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_clien -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 Modified: head/usr.bin/svn/svnrdump/Makefile ============================================================================== --- head/usr.bin/svn/svnrdump/Makefile Sat Nov 22 19:18:08 2014 (r274884) +++ head/usr.bin/svn/svnrdump/Makefile Sat Nov 22 19:44:49 2014 (r274885) @@ -35,14 +35,15 @@ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_clien -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 Modified: head/usr.bin/svn/svnserve/Makefile ============================================================================== --- head/usr.bin/svn/svnserve/Makefile Sat Nov 22 19:18:08 2014 (r274884) +++ head/usr.bin/svn/svnserve/Makefile Sat Nov 22 19:44:49 2014 (r274885) @@ -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 Modified: head/usr.bin/svn/svnsync/Makefile ============================================================================== --- head/usr.bin/svn/svnsync/Makefile Sat Nov 22 19:18:08 2014 (r274884) +++ head/usr.bin/svn/svnsync/Makefile Sat Nov 22 19:44:49 2014 (r274885) @@ -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 Modified: head/usr.bin/svn/svnversion/Makefile ============================================================================== --- head/usr.bin/svn/svnversion/Makefile Sat Nov 22 19:18:08 2014 (r274884) +++ head/usr.bin/svn/svnversion/Makefile Sat Nov 22 19:44:49 2014 (r274885) @@ -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