On 18 Jun, Peter Wemm wrote:
> Added: head/usr.bin/svn/Makefile.inc
> ==============================================================================
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/usr.bin/svn/Makefile.inc Tue Jun 18 02:53:45 2013
> (r251886)
> @@ -0,0 +1,61 @@
> +# $FreeBSD$
> +
> +.include <bsd.own.mk>
> +
> +.if ${MK_SVN} == "yes"
> +SVNLITE?=
> +.else
> +SVNLITE?= lite
> +.endif
> +
> +.if !defined(SVNDIR)
> +
> +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)
> +.include "${.CURDIR}/../../Makefile.inc"
> +.endif
> +
> +LIBAPRDIR= ${.OBJDIR}/../lib/libapr
> +LIBAPR_UTILDIR= ${.OBJDIR}/../lib/libapr_util
> +LIBSQLITEDIR= ${.OBJDIR}/../lib/libsqlite3
> +LIBSERFDIR= ${.OBJDIR}/../lib/libserf
> +
> +LIBSVN_CLIENTDIR= ${.OBJDIR}/../lib/libsvn_client
> +LIBSVN_DELTADIR= ${.OBJDIR}/../lib/libsvn_delta
> +LIBSVN_DIFFDIR= ${.OBJDIR}/../lib/libsvn_diff
> +LIBSVN_FSDIR= ${.OBJDIR}/../lib/libsvn_fs
> +LIBSVN_FS_FSDIR= ${.OBJDIR}/../lib/libsvn_fs_fs
> +LIBSVN_FS_UTILDIR= ${.OBJDIR}/../lib/libsvn_fs_util
> +LIBSVN_RADIR= ${.OBJDIR}/../lib/libsvn_ra
> +LIBSVN_RA_LOCALDIR= ${.OBJDIR}/../lib/libsvn_ra_local
> +LIBSVN_RA_SVNDIR= ${.OBJDIR}/../lib/libsvn_ra_svn
> +LIBSVN_RA_SERFDIR= ${.OBJDIR}/../lib/libsvn_ra_serf
> +LIBSVN_REPOSDIR= ${.OBJDIR}/../lib/libsvn_repos
> +LIBSVN_SUBRDIR= ${.OBJDIR}/../lib/libsvn_subr
> +LIBSVN_WCDIR= ${.OBJDIR}/../lib/libsvn_wc
> +
> +LIBAPR= ${LIBAPRDIR}/libapr.a
> +LIBAPR_UTIL= ${LIBAPR_UTILDIR}/libapr_util.a
> +LIBSQLITE= ${LIBSQLITEDIR}/libsqlite3.a
> +LIBSERF= ${LIBSQLITEDIR}/libserf.a
Should the last line be
+LIBSERF= ${LIBSERFDIR}/libserf.a
I'm seeing the following buildworld failure on this machine:
FreeBSD scratch.catspoiler.org 10.0-CURRENT FreeBSD 10.0-CURRENT #28
r250744: Fri May 17 15:15:52 PDT 2013
d...@scratch.catspoiler.org:/usr/obj/usr/src/sys/GENERICSMB i386
cc -O2 -pipe -march=athlon64 -I/usr/src/usr.bin/svn/svn/../../../contrib/subver
sion/subversion/include -I/usr/src/usr.bin/svn/svn/../../../contrib/subversion/s
ubversion -I/usr/src/usr.bin/svn/svn/.. -I/usr/src/usr.bin/svn/svn/../lib/libap
r -I/usr/src/usr.bin/svn/svn/../../../contrib/apr/include/arch/unix -I/usr/src
/usr.bin/svn/svn/../../../contrib/apr/include -I/usr/src/usr.bin/svn/svn/../lib
/libapr_util -I/usr/src/usr.bin/svn/svn/../../../contrib/apr-util/include/priva
te -I/usr/src/usr.bin/svn/svn/../../../contrib/apr-util/include -std=gnu99 -Qun
used-arguments -fstack-protector -Wno-pointer-sign -Wno-empty-body -Wno-string-p
lus-int -Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality -W
no-unused-function -Wno-conversion -Wno-switch -Wno-switch-enum -Wno-knr-promote
d-parameter -Wno-parentheses -c /usr/src/usr.bin/svn/svn/../../../contrib/subver
sion/subversion/svn/util.c
make: don't know how to make /usr/obj/usr/src/usr.bin/svn/svn/../lib/libsqlite3/
libserf.a. Stop
*** [all] Error code 2
Stop in /usr/src/usr.bin/svn.
*** [all] Error code 1
Stop in /usr/src/usr.bin.
It looks like make is looking for libserf.a in the wrong directory.
# ls /usr/obj/usr/src/usr.bin/svn/lib/libsqlite3
.depend libsqlite3.a sqlite3.o
ls /usr/obj/usr/src/usr.bin/svn/lib/libserf
.depend bwtp_buckets.o limit_buckets.o
aggregate_buckets.o chunk_buckets.o mmap_buckets.o
allocator.o context.o outgoing.o
auth.o dechunk_buckets.o request_buckets.o
auth_basic.o deflate_buckets.o response_body_buckets.o
auth_digest.o file_buckets.o response_buckets.o
auth_kerb.o headers_buckets.o simple_buckets.o
auth_kerb_gss.o incoming.o socket_buckets.o
barrier_buckets.o iovec_buckets.o ssl_buckets.o
buckets.o libserf.a ssltunnel.o
I've got two other questions. Why isn't anyone else (or the tinderbox)
seeing this problem? Why does the svnlite build succeed if I run make
from /usr/src/usr.bin/svn/svn?
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
