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

svn: support building with WITH_PIE

Browse Source 
Subversion builds and links against its own .a archives using local
rules, so did not benefit from with the WITH_PIE library support added
in r344179.  Apply the same _pie suffix locally.

Reviewed by:	cem
Differential Revision:	https://reviews.freebsd.org/D19246
This commit is contained in:
emaste 2019-02-21 15:08:25 +00:00
parent 621218a1ed
commit 0514659c04
12 changed files with 159 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,13 +2,14 @@
.include <src.opts.mk> .include <src.opts.mk>
MK_PIE:= no # Explicit libXXX.a references
.if ${MK_SVN} == "yes" .if ${MK_SVN} == "yes"
SVNLITE?= SVNLITE?=
.else .else
SVNLITE?= lite SVNLITE?= lite
.endif .endif
.if ${MK_PIE} != "no"
PIE_SUFFIX= _pie
.endif
PACKAGE= svn PACKAGE= svn
@ -40,23 +41,23 @@ LIBSVN_REPOSDIR= ${.OBJDIR:H}/lib/libsvn_repos
LIBSVN_SUBRDIR= ${.OBJDIR:H}/lib/libsvn_subr LIBSVN_SUBRDIR= ${.OBJDIR:H}/lib/libsvn_subr
LIBSVN_WCDIR= ${.OBJDIR:H}/lib/libsvn_wc LIBSVN_WCDIR= ${.OBJDIR:H}/lib/libsvn_wc
LIBAPR= ${LIBAPRDIR}/libapr.a LIBAPR= ${LIBAPRDIR}/libapr${PIE_SUFFIX}.a
LIBAPR_UTIL= ${LIBAPR_UTILDIR}/libapr-util.a LIBAPR_UTIL= ${LIBAPR_UTILDIR}/libapr-util${PIE_SUFFIX}.a
LIBSERF= ${LIBSERFDIR}/libserf.a LIBSERF= ${LIBSERFDIR}/libserf${PIE_SUFFIX}.a
LIBSVN_CLIENT= ${LIBSVN_CLIENTDIR}/libsvn_client.a LIBSVN_CLIENT= ${LIBSVN_CLIENTDIR}/libsvn_client${PIE_SUFFIX}.a
LIBSVN_DELTA= ${LIBSVN_DELTADIR}/libsvn_delta.a LIBSVN_DELTA= ${LIBSVN_DELTADIR}/libsvn_delta${PIE_SUFFIX}.a
LIBSVN_DIFF= ${LIBSVN_DIFFDIR}/libsvn_diff.a LIBSVN_DIFF= ${LIBSVN_DIFFDIR}/libsvn_diff${PIE_SUFFIX}.a
LIBSVN_FS= ${LIBSVN_FSDIR}/libsvn_fs.a LIBSVN_FS= ${LIBSVN_FSDIR}/libsvn_fs${PIE_SUFFIX}.a
LIBSVN_FS_FS= ${LIBSVN_FS_FSDIR}/libsvn_fs_fs.a LIBSVN_FS_FS= ${LIBSVN_FS_FSDIR}/libsvn_fs_fs${PIE_SUFFIX}.a
LIBSVN_FS_UTIL= ${LIBSVN_FS_UTILDIR}/libsvn_fs_util.a LIBSVN_FS_UTIL= ${LIBSVN_FS_UTILDIR}/libsvn_fs_util${PIE_SUFFIX}.a
LIBSVN_FS_X= ${LIBSVN_FS_XDIR}/libsvn_fs_x.a LIBSVN_FS_X= ${LIBSVN_FS_XDIR}/libsvn_fs_x${PIE_SUFFIX}.a
LIBSVN_RA= ${LIBSVN_RADIR}/libsvn_ra.a LIBSVN_RA= ${LIBSVN_RADIR}/libsvn_ra${PIE_SUFFIX}.a
LIBSVN_RA_LOCAL= ${LIBSVN_RA_LOCALDIR}/libsvn_ra_local.a LIBSVN_RA_LOCAL= ${LIBSVN_RA_LOCALDIR}/libsvn_ra_local${PIE_SUFFIX}.a
LIBSVN_RA_SVN= ${LIBSVN_RA_SVNDIR}/libsvn_ra_svn.a LIBSVN_RA_SVN= ${LIBSVN_RA_SVNDIR}/libsvn_ra_svn${PIE_SUFFIX}.a
LIBSVN_RA_SERF= ${LIBSVN_RA_SERFDIR}/libsvn_ra_serf.a LIBSVN_RA_SERF= ${LIBSVN_RA_SERFDIR}/libsvn_ra_serf${PIE_SUFFIX}.a
LIBSVN_REPOS= ${LIBSVN_REPOSDIR}/libsvn_repos.a LIBSVN_REPOS= ${LIBSVN_REPOSDIR}/libsvn_repos${PIE_SUFFIX}.a
LIBSVN_SUBR= ${LIBSVN_SUBRDIR}/libsvn_subr.a LIBSVN_SUBR= ${LIBSVN_SUBRDIR}/libsvn_subr${PIE_SUFFIX}.a
LIBSVN_WC= ${LIBSVN_WCDIR}/libsvn_wc.a LIBSVN_WC= ${LIBSVN_WCDIR}/libsvn_wc${PIE_SUFFIX}.a
.endif .endif

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

@ -26,23 +26,23 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${APRU}/include/private \ -I${APRU}/include/private \
-I${APRU}/include -I${APRU}/include
LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \
-L${LIBSVN_WCDIR} -lsvn_wc \ -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \
-L${LIBSVN_RADIR} -lsvn_ra \ -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \ -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \ -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \ -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
-L${LIBSVN_REPOSDIR} -lsvn_repos \ -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
-L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_XDIR} -lsvn_fs_x \ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
-L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
-L${LIBSVN_DIFFDIR} -lsvn_diff \ -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
-L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
-L${LIBSERFDIR} -lserf \ -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util \ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z magic crypto ssl pthread LIBADD+= bsdxml sqlite3 z magic crypto ssl pthread
DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \ DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \

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

@ -18,15 +18,15 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${APRU}/include/private \ -I${APRU}/include/private \
-I${APRU}/include -I${APRU}/include
LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
-L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_XDIR} -lsvn_fs_x \ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
-L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
-L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util \ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z pthread LIBADD+= bsdxml sqlite3 z pthread
DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \

34
usr.bin/svn/svnbench/Makefile
View File

@ -19,23 +19,23 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${APRU}/include/private \ -I${APRU}/include/private \
-I${APRU}/include -I${APRU}/include
LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \
-L${LIBSVN_WCDIR} -lsvn_wc \ -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \
-L${LIBSVN_RADIR} -lsvn_ra \ -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \ -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \ -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \ -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
-L${LIBSVN_REPOSDIR} -lsvn_repos \ -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
-L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_XDIR} -lsvn_fs_x \ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
-L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
-L${LIBSVN_DIFFDIR} -lsvn_diff \ -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
-L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
-L${LIBSERFDIR} -lserf \ -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util \ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z magic crypto ssl pthread LIBADD+= bsdxml sqlite3 z magic crypto ssl pthread

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

@ -18,15 +18,15 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${APRU}/include/private \ -I${APRU}/include/private \
-I${APRU}/include -I${APRU}/include
LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
-L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_XDIR} -lsvn_fs_x \ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
-L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
-L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util \ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z crypt pthread LIBADD+= bsdxml sqlite3 z crypt pthread
DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \

18
usr.bin/svn/svnfsfs/Makefile
View File

@ -18,15 +18,15 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${APRU}/include/private \ -I${APRU}/include/private \
-I${APRU}/include -I${APRU}/include
LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
-L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_XDIR} -lsvn_fs_x \ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
-L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
-L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util \ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z pthread LIBADD+= bsdxml sqlite3 z pthread
DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \

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

@ -18,16 +18,16 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${APRU}/include/private \ -I${APRU}/include/private \
-I${APRU}/include -I${APRU}/include
LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
-L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_XDIR} -lsvn_fs_x \ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
-L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
-L${LIBSVN_DIFFDIR} -lsvn_diff \ -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
-L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util \ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z pthread LIBADD+= bsdxml sqlite3 z pthread
DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \

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

@ -18,23 +18,23 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${APRU}/include/private \ -I${APRU}/include/private \
-I${APRU}/include -I${APRU}/include
LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \
-L${LIBSVN_WCDIR} -lsvn_wc \ -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \
-L${LIBSVN_RADIR} -lsvn_ra \ -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \ -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \ -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \ -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
-L${LIBSVN_REPOSDIR} -lsvn_repos \ -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
-L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_XDIR} -lsvn_fs_x \ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
-L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
-L${LIBSVN_DIFFDIR} -lsvn_diff \ -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
-L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
-L${LIBSERFDIR} -lserf \ -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util \ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z crypto ssl pthread LIBADD+= bsdxml sqlite3 z crypto ssl pthread
DPADD= ${LIBSVN_CLIENT} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} \ DPADD= ${LIBSVN_CLIENT} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} \

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

@ -18,23 +18,23 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${APRU}/include/private \ -I${APRU}/include/private \
-I${APRU}/include -I${APRU}/include
LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \ LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \
-L${LIBSVN_WCDIR} -lsvn_wc \ -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \
-L${LIBSVN_RADIR} -lsvn_ra \ -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \ -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \ -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \ -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
-L${LIBSVN_REPOSDIR} -lsvn_repos \ -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
-L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_XDIR} -lsvn_fs_x \ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
-L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
-L${LIBSVN_DIFFDIR} -lsvn_diff \ -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
-L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
-L${LIBSERFDIR} -lserf \ -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util \ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z crypto ssl pthread LIBADD+= bsdxml sqlite3 z crypto ssl pthread
DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \ DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \

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

@ -18,20 +18,20 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${APRU}/include/private \ -I${APRU}/include/private \
-I${APRU}/include -I${APRU}/include
LDADD= -L${LIBSVN_RADIR} -lsvn_ra \ LDADD= -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \ -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \ -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \ -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
-L${LIBSVN_REPOSDIR} -lsvn_repos \ -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
-L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_XDIR} -lsvn_fs_x \ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
-L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
-L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
-L${LIBSERFDIR} -lserf \ -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util \ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD= bsdxml sqlite3 z pthread LIBADD= bsdxml sqlite3 z pthread
DPADD= ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \ DPADD= ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \

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

@ -18,20 +18,20 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${APRU}/include/private \ -I${APRU}/include/private \
-I${APRU}/include -I${APRU}/include
LDADD= -L${LIBSVN_RADIR} -lsvn_ra \ LDADD= -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \ -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \ -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \ -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
-L${LIBSVN_REPOSDIR} -lsvn_repos \ -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
-L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
-L${LIBSVN_FS_XDIR} -lsvn_fs_x \ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
-L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
-L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
-L${LIBSERFDIR} -lserf \ -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util \ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD= bsdxml sqlite3 z crypto ssl pthread LIBADD= bsdxml sqlite3 z crypto ssl pthread
DPADD= ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \ DPADD= ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \

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

@ -18,12 +18,12 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \
-I${APRU}/include/private \ -I${APRU}/include/private \
-I${APRU}/include -I${APRU}/include
LDADD= -L${LIBSVN_WCDIR} -lsvn_wc \ LDADD= -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \
-L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
-L${LIBSVN_DIFFDIR} -lsvn_diff \ -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
-L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
-L${LIBAPR_UTILDIR} -lapr-util \ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
-L${LIBAPRDIR} -lapr -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z pthread LIBADD+= bsdxml sqlite3 z pthread
DPADD= ${LIBSVN_WC} ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} \ DPADD= ${LIBSVN_WC} ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} \