aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/svn
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2014-11-22 19:44:49 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2014-11-22 19:44:49 +0000
commit362492e53e0d53c771e24be22c5697300b7d8f74 (patch)
treec63dd3d5d27cd2d973b8979f12acdf1339342a6c /usr.bin/svn
parent912bdb4db78de4a2bfe5c7db64b1fadf0de1d846 (diff)
downloadsrc-362492e53e0d53c771e24be22c5697300b7d8f74.tar.gz
src-362492e53e0d53c771e24be22c5697300b7d8f74.zip
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
Notes
Notes: svn path=/head/; revision=274885
Diffstat (limited to 'usr.bin/svn')
-rw-r--r--usr.bin/svn/Makefile.inc3
-rw-r--r--usr.bin/svn/lib/Makefile2
-rw-r--r--usr.bin/svn/lib/libsqlite3/Makefile25
-rw-r--r--usr.bin/svn/svn/Makefile5
-rw-r--r--usr.bin/svn/svnadmin/Makefile6
-rw-r--r--usr.bin/svn/svndumpfilter/Makefile5
-rw-r--r--usr.bin/svn/svnlook/Makefile5
-rw-r--r--usr.bin/svn/svnmucc/Makefile5
-rw-r--r--usr.bin/svn/svnrdump/Makefile5
-rw-r--r--usr.bin/svn/svnserve/Makefile5
-rw-r--r--usr.bin/svn/svnsync/Makefile5
-rw-r--r--usr.bin/svn/svnversion/Makefile5
12 files changed, 29 insertions, 47 deletions
diff --git a/usr.bin/svn/Makefile.inc b/usr.bin/svn/Makefile.inc
index 203b8175bd94..5fe6464d035d 100644
--- a/usr.bin/svn/Makefile.inc
+++ b/usr.bin/svn/Makefile.inc
@@ -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
diff --git a/usr.bin/svn/lib/Makefile b/usr.bin/svn/lib/Makefile
index 3200625cd2dd..5f4cf28d029f 100644
--- a/usr.bin/svn/lib/Makefile
+++ b/usr.bin/svn/lib/Makefile
@@ -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
diff --git a/usr.bin/svn/lib/libsqlite3/Makefile b/usr.bin/svn/lib/libsqlite3/Makefile
deleted file mode 100644
index 15a2d000276c..000000000000
--- a/usr.bin/svn/lib/libsqlite3/Makefile
+++ /dev/null
@@ -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>
diff --git a/usr.bin/svn/svn/Makefile b/usr.bin/svn/svn/Makefile
index 76d923a83464..24e2ec843b78 100644
--- a/usr.bin/svn/svn/Makefile
+++ b/usr.bin/svn/svn/Makefile
@@ -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))
diff --git a/usr.bin/svn/svnadmin/Makefile b/usr.bin/svn/svnadmin/Makefile
index 1dd58530576a..afc7c0b05f80 100644
--- a/usr.bin/svn/svnadmin/Makefile
+++ b/usr.bin/svn/svnadmin/Makefile
@@ -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>
diff --git a/usr.bin/svn/svndumpfilter/Makefile b/usr.bin/svn/svndumpfilter/Makefile
index 80d258429685..995a6e6f2c24 100644
--- a/usr.bin/svn/svndumpfilter/Makefile
+++ b/usr.bin/svn/svndumpfilter/Makefile
@@ -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>
diff --git a/usr.bin/svn/svnlook/Makefile b/usr.bin/svn/svnlook/Makefile
index 5307e3743f20..7e9968ee48c9 100644
--- a/usr.bin/svn/svnlook/Makefile
+++ b/usr.bin/svn/svnlook/Makefile
@@ -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>
diff --git a/usr.bin/svn/svnmucc/Makefile b/usr.bin/svn/svnmucc/Makefile
index 23a98e30ffc3..45c751115164 100644
--- a/usr.bin/svn/svnmucc/Makefile
+++ b/usr.bin/svn/svnmucc/Makefile
@@ -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>
diff --git a/usr.bin/svn/svnrdump/Makefile b/usr.bin/svn/svnrdump/Makefile
index afeae003c994..8045e7bb0508 100644
--- a/usr.bin/svn/svnrdump/Makefile
+++ b/usr.bin/svn/svnrdump/Makefile
@@ -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>
diff --git a/usr.bin/svn/svnserve/Makefile b/usr.bin/svn/svnserve/Makefile
index f1fa314e1628..f01bbbdb8790 100644
--- a/usr.bin/svn/svnserve/Makefile
+++ b/usr.bin/svn/svnserve/Makefile
@@ -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>
diff --git a/usr.bin/svn/svnsync/Makefile b/usr.bin/svn/svnsync/Makefile
index a8cd3802ad53..7bba53403f2f 100644
--- a/usr.bin/svn/svnsync/Makefile
+++ b/usr.bin/svn/svnsync/Makefile
@@ -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>
diff --git a/usr.bin/svn/svnversion/Makefile b/usr.bin/svn/svnversion/Makefile
index b6ca8267a6fb..ac45431f9c69 100644
--- a/usr.bin/svn/svnversion/Makefile
+++ b/usr.bin/svn/svnversion/Makefile
@@ -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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 16:00:48 +0000