Page MenuHomeFreeBSD
Files F157062593

D19246.id.diff
No OneTemporary
Actions

D19246.id.diff
View Options

Index: head/usr.bin/svn/Makefile.inc
===================================================================
--- head/usr.bin/svn/Makefile.inc
+++ head/usr.bin/svn/Makefile.inc
@@ -2,13 +2,14 @@
.include <src.opts.mk>
-MK_PIE:= no # Explicit libXXX.a references
-
.if ${MK_SVN} == "yes"
SVNLITE?=
.else
SVNLITE?= lite
.endif
+.if ${MK_PIE} != "no"
+PIE_SUFFIX= _pie
+.endif
PACKAGE= svn
@@ -40,23 +41,23 @@
LIBSVN_SUBRDIR= ${.OBJDIR:H}/lib/libsvn_subr
LIBSVN_WCDIR= ${.OBJDIR:H}/lib/libsvn_wc
-LIBAPR= ${LIBAPRDIR}/libapr.a
-LIBAPR_UTIL= ${LIBAPR_UTILDIR}/libapr-util.a
-LIBSERF= ${LIBSERFDIR}/libserf.a
+LIBAPR= ${LIBAPRDIR}/libapr${PIE_SUFFIX}.a
+LIBAPR_UTIL= ${LIBAPR_UTILDIR}/libapr-util${PIE_SUFFIX}.a
+LIBSERF= ${LIBSERFDIR}/libserf${PIE_SUFFIX}.a
-LIBSVN_CLIENT= ${LIBSVN_CLIENTDIR}/libsvn_client.a
-LIBSVN_DELTA= ${LIBSVN_DELTADIR}/libsvn_delta.a
-LIBSVN_DIFF= ${LIBSVN_DIFFDIR}/libsvn_diff.a
-LIBSVN_FS= ${LIBSVN_FSDIR}/libsvn_fs.a
-LIBSVN_FS_FS= ${LIBSVN_FS_FSDIR}/libsvn_fs_fs.a
-LIBSVN_FS_UTIL= ${LIBSVN_FS_UTILDIR}/libsvn_fs_util.a
-LIBSVN_FS_X= ${LIBSVN_FS_XDIR}/libsvn_fs_x.a
-LIBSVN_RA= ${LIBSVN_RADIR}/libsvn_ra.a
-LIBSVN_RA_LOCAL= ${LIBSVN_RA_LOCALDIR}/libsvn_ra_local.a
-LIBSVN_RA_SVN= ${LIBSVN_RA_SVNDIR}/libsvn_ra_svn.a
-LIBSVN_RA_SERF= ${LIBSVN_RA_SERFDIR}/libsvn_ra_serf.a
-LIBSVN_REPOS= ${LIBSVN_REPOSDIR}/libsvn_repos.a
-LIBSVN_SUBR= ${LIBSVN_SUBRDIR}/libsvn_subr.a
-LIBSVN_WC= ${LIBSVN_WCDIR}/libsvn_wc.a
+LIBSVN_CLIENT= ${LIBSVN_CLIENTDIR}/libsvn_client${PIE_SUFFIX}.a
+LIBSVN_DELTA= ${LIBSVN_DELTADIR}/libsvn_delta${PIE_SUFFIX}.a
+LIBSVN_DIFF= ${LIBSVN_DIFFDIR}/libsvn_diff${PIE_SUFFIX}.a
+LIBSVN_FS= ${LIBSVN_FSDIR}/libsvn_fs${PIE_SUFFIX}.a
+LIBSVN_FS_FS= ${LIBSVN_FS_FSDIR}/libsvn_fs_fs${PIE_SUFFIX}.a
+LIBSVN_FS_UTIL= ${LIBSVN_FS_UTILDIR}/libsvn_fs_util${PIE_SUFFIX}.a
+LIBSVN_FS_X= ${LIBSVN_FS_XDIR}/libsvn_fs_x${PIE_SUFFIX}.a
+LIBSVN_RA= ${LIBSVN_RADIR}/libsvn_ra${PIE_SUFFIX}.a
+LIBSVN_RA_LOCAL= ${LIBSVN_RA_LOCALDIR}/libsvn_ra_local${PIE_SUFFIX}.a
+LIBSVN_RA_SVN= ${LIBSVN_RA_SVNDIR}/libsvn_ra_svn${PIE_SUFFIX}.a
+LIBSVN_RA_SERF= ${LIBSVN_RA_SERFDIR}/libsvn_ra_serf${PIE_SUFFIX}.a
+LIBSVN_REPOS= ${LIBSVN_REPOSDIR}/libsvn_repos${PIE_SUFFIX}.a
+LIBSVN_SUBR= ${LIBSVN_SUBRDIR}/libsvn_subr${PIE_SUFFIX}.a
+LIBSVN_WC= ${LIBSVN_WCDIR}/libsvn_wc${PIE_SUFFIX}.a
.endif
Index: head/usr.bin/svn/svn/Makefile
===================================================================
--- head/usr.bin/svn/svn/Makefile
+++ head/usr.bin/svn/svn/Makefile
@@ -26,23 +26,23 @@
-I${APRU}/include/private \
-I${APRU}/include
-LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \
- -L${LIBSVN_WCDIR} -lsvn_wc \
- -L${LIBSVN_RADIR} -lsvn_ra \
- -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
- -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
- -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \
- -L${LIBSVN_REPOSDIR} -lsvn_repos \
- -L${LIBSVN_FSDIR} -lsvn_fs \
- -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
- -L${LIBSVN_FS_XDIR} -lsvn_fs_x \
- -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
- -L${LIBSVN_DELTADIR} -lsvn_delta \
- -L${LIBSVN_DIFFDIR} -lsvn_diff \
- -L${LIBSVN_SUBRDIR} -lsvn_subr \
- -L${LIBSERFDIR} -lserf \
- -L${LIBAPR_UTILDIR} -lapr-util \
- -L${LIBAPRDIR} -lapr
+LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \
+ -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \
+ -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
+ -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
+ -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
+ -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
+ -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+ -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
+ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+ -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
+ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+ -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z magic crypto ssl pthread
DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \
Index: head/usr.bin/svn/svnadmin/Makefile
===================================================================
--- head/usr.bin/svn/svnadmin/Makefile
+++ head/usr.bin/svn/svnadmin/Makefile
@@ -18,15 +18,15 @@
-I${APRU}/include/private \
-I${APRU}/include
-LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \
- -L${LIBSVN_FSDIR} -lsvn_fs \
- -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
- -L${LIBSVN_FS_XDIR} -lsvn_fs_x \
- -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
- -L${LIBSVN_DELTADIR} -lsvn_delta \
- -L${LIBSVN_SUBRDIR} -lsvn_subr \
- -L${LIBAPR_UTILDIR} -lapr-util \
- -L${LIBAPRDIR} -lapr
+LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+ -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z pthread
DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
Index: head/usr.bin/svn/svnbench/Makefile
===================================================================
--- head/usr.bin/svn/svnbench/Makefile
+++ head/usr.bin/svn/svnbench/Makefile
@@ -19,23 +19,23 @@
-I${APRU}/include/private \
-I${APRU}/include
-LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \
- -L${LIBSVN_WCDIR} -lsvn_wc \
- -L${LIBSVN_RADIR} -lsvn_ra \
- -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
- -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
- -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \
- -L${LIBSVN_REPOSDIR} -lsvn_repos \
- -L${LIBSVN_FSDIR} -lsvn_fs \
- -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
- -L${LIBSVN_FS_XDIR} -lsvn_fs_x \
- -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
- -L${LIBSVN_DELTADIR} -lsvn_delta \
- -L${LIBSVN_DIFFDIR} -lsvn_diff \
- -L${LIBSVN_SUBRDIR} -lsvn_subr \
- -L${LIBSERFDIR} -lserf \
- -L${LIBAPR_UTILDIR} -lapr-util \
- -L${LIBAPRDIR} -lapr
+LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \
+ -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \
+ -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
+ -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
+ -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
+ -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
+ -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+ -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
+ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+ -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
+ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+ -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z magic crypto ssl pthread
Index: head/usr.bin/svn/svndumpfilter/Makefile
===================================================================
--- head/usr.bin/svn/svndumpfilter/Makefile
+++ head/usr.bin/svn/svndumpfilter/Makefile
@@ -18,15 +18,15 @@
-I${APRU}/include/private \
-I${APRU}/include
-LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \
- -L${LIBSVN_FSDIR} -lsvn_fs \
- -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
- -L${LIBSVN_FS_XDIR} -lsvn_fs_x \
- -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
- -L${LIBSVN_DELTADIR} -lsvn_delta \
- -L${LIBSVN_SUBRDIR} -lsvn_subr \
- -L${LIBAPR_UTILDIR} -lapr-util \
- -L${LIBAPRDIR} -lapr
+LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+ -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z crypt pthread
DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
Index: head/usr.bin/svn/svnfsfs/Makefile
===================================================================
--- head/usr.bin/svn/svnfsfs/Makefile
+++ head/usr.bin/svn/svnfsfs/Makefile
@@ -18,15 +18,15 @@
-I${APRU}/include/private \
-I${APRU}/include
-LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \
- -L${LIBSVN_FSDIR} -lsvn_fs \
- -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
- -L${LIBSVN_FS_XDIR} -lsvn_fs_x \
- -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
- -L${LIBSVN_DELTADIR} -lsvn_delta \
- -L${LIBSVN_SUBRDIR} -lsvn_subr \
- -L${LIBAPR_UTILDIR} -lapr-util \
- -L${LIBAPRDIR} -lapr
+LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+ -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z pthread
DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
Index: head/usr.bin/svn/svnlook/Makefile
===================================================================
--- head/usr.bin/svn/svnlook/Makefile
+++ head/usr.bin/svn/svnlook/Makefile
@@ -18,16 +18,16 @@
-I${APRU}/include/private \
-I${APRU}/include
-LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \
- -L${LIBSVN_FSDIR} -lsvn_fs \
- -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
- -L${LIBSVN_FS_XDIR} -lsvn_fs_x \
- -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
- -L${LIBSVN_DELTADIR} -lsvn_delta \
- -L${LIBSVN_DIFFDIR} -lsvn_diff \
- -L${LIBSVN_SUBRDIR} -lsvn_subr \
- -L${LIBAPR_UTILDIR} -lapr-util \
- -L${LIBAPRDIR} -lapr
+LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+ -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
+ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+ -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z pthread
DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
Index: head/usr.bin/svn/svnmucc/Makefile
===================================================================
--- head/usr.bin/svn/svnmucc/Makefile
+++ head/usr.bin/svn/svnmucc/Makefile
@@ -18,23 +18,23 @@
-I${APRU}/include/private \
-I${APRU}/include
-LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \
- -L${LIBSVN_WCDIR} -lsvn_wc \
- -L${LIBSVN_RADIR} -lsvn_ra \
- -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
- -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
- -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \
- -L${LIBSVN_REPOSDIR} -lsvn_repos \
- -L${LIBSVN_FSDIR} -lsvn_fs \
- -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
- -L${LIBSVN_FS_XDIR} -lsvn_fs_x \
- -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
- -L${LIBSVN_DELTADIR} -lsvn_delta \
- -L${LIBSVN_DIFFDIR} -lsvn_diff \
- -L${LIBSVN_SUBRDIR} -lsvn_subr \
- -L${LIBSERFDIR} -lserf \
- -L${LIBAPR_UTILDIR} -lapr-util \
- -L${LIBAPRDIR} -lapr
+LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \
+ -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \
+ -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
+ -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
+ -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
+ -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
+ -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+ -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
+ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+ -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
+ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+ -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z crypto ssl pthread
DPADD= ${LIBSVN_CLIENT} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} \
Index: head/usr.bin/svn/svnrdump/Makefile
===================================================================
--- head/usr.bin/svn/svnrdump/Makefile
+++ head/usr.bin/svn/svnrdump/Makefile
@@ -18,23 +18,23 @@
-I${APRU}/include/private \
-I${APRU}/include
-LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \
- -L${LIBSVN_WCDIR} -lsvn_wc \
- -L${LIBSVN_RADIR} -lsvn_ra \
- -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
- -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
- -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \
- -L${LIBSVN_REPOSDIR} -lsvn_repos \
- -L${LIBSVN_FSDIR} -lsvn_fs \
- -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
- -L${LIBSVN_FS_XDIR} -lsvn_fs_x \
- -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
- -L${LIBSVN_DELTADIR} -lsvn_delta \
- -L${LIBSVN_DIFFDIR} -lsvn_diff \
- -L${LIBSVN_SUBRDIR} -lsvn_subr \
- -L${LIBSERFDIR} -lserf \
- -L${LIBAPR_UTILDIR} -lapr-util \
- -L${LIBAPRDIR} -lapr
+LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \
+ -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \
+ -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
+ -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
+ -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
+ -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
+ -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+ -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
+ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+ -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
+ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+ -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z crypto ssl pthread
DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \
Index: head/usr.bin/svn/svnserve/Makefile
===================================================================
--- head/usr.bin/svn/svnserve/Makefile
+++ head/usr.bin/svn/svnserve/Makefile
@@ -18,20 +18,20 @@
-I${APRU}/include/private \
-I${APRU}/include
-LDADD= -L${LIBSVN_RADIR} -lsvn_ra \
- -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
- -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
- -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \
- -L${LIBSVN_REPOSDIR} -lsvn_repos \
- -L${LIBSVN_FSDIR} -lsvn_fs \
- -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
- -L${LIBSVN_FS_XDIR} -lsvn_fs_x \
- -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
- -L${LIBSVN_DELTADIR} -lsvn_delta \
- -L${LIBSVN_SUBRDIR} -lsvn_subr \
- -L${LIBSERFDIR} -lserf \
- -L${LIBAPR_UTILDIR} -lapr-util \
- -L${LIBAPRDIR} -lapr
+LDADD= -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
+ -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
+ -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
+ -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
+ -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+ -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
+ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+ -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD= bsdxml sqlite3 z pthread
DPADD= ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \
Index: head/usr.bin/svn/svnsync/Makefile
===================================================================
--- head/usr.bin/svn/svnsync/Makefile
+++ head/usr.bin/svn/svnsync/Makefile
@@ -18,20 +18,20 @@
-I${APRU}/include/private \
-I${APRU}/include
-LDADD= -L${LIBSVN_RADIR} -lsvn_ra \
- -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
- -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
- -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \
- -L${LIBSVN_REPOSDIR} -lsvn_repos \
- -L${LIBSVN_FSDIR} -lsvn_fs \
- -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
- -L${LIBSVN_FS_XDIR} -lsvn_fs_x \
- -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
- -L${LIBSVN_DELTADIR} -lsvn_delta \
- -L${LIBSVN_SUBRDIR} -lsvn_subr \
- -L${LIBSERFDIR} -lserf \
- -L${LIBAPR_UTILDIR} -lapr-util \
- -L${LIBAPRDIR} -lapr
+LDADD= -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \
+ -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \
+ -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \
+ -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \
+ -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \
+ -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \
+ -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \
+ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \
+ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+ -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \
+ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+ -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD= bsdxml sqlite3 z crypto ssl pthread
DPADD= ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \
Index: head/usr.bin/svn/svnversion/Makefile
===================================================================
--- head/usr.bin/svn/svnversion/Makefile
+++ head/usr.bin/svn/svnversion/Makefile
@@ -18,12 +18,12 @@
-I${APRU}/include/private \
-I${APRU}/include
-LDADD= -L${LIBSVN_WCDIR} -lsvn_wc \
- -L${LIBSVN_DELTADIR} -lsvn_delta \
- -L${LIBSVN_DIFFDIR} -lsvn_diff \
- -L${LIBSVN_SUBRDIR} -lsvn_subr \
- -L${LIBAPR_UTILDIR} -lapr-util \
- -L${LIBAPRDIR} -lapr
+LDADD= -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \
+ -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \
+ -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \
+ -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \
+ -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \
+ -L${LIBAPRDIR} -lapr${PIE_SUFFIX}
LIBADD+= bsdxml sqlite3 z pthread
DPADD= ${LIBSVN_WC} ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} \

File Metadata

Mime Type
text/plain
Expires
Tue, May 19, 5:29 AM (6 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33288184
Default Alt Text
D19246.id.diff (17 KB)

Event Timeline