git: 61f16b172c65 - 2022Q2 - devel/subversion: Make all binaries stripping explicit.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 22 Apr 2022 09:46:11 UTC
The branch 2022Q2 has been updated by lev:
URL: https://cgit.FreeBSD.org/ports/commit/?id=61f16b172c65948c6bc1502e7f05827ab4f4e728
commit 61f16b172c65948c6bc1502e7f05827ab4f4e728
Author: Lev A. Serebryakov <lev@FreeBSD.org>
AuthorDate: 2022-04-13 18:19:35 +0000
Commit: Lev A. Serebryakov <lev@FreeBSD.org>
CommitDate: 2022-04-22 09:46:05 +0000
devel/subversion: Make all binaries stripping explicit.
Running ${STRIP_CMD} on non-binary file can left zero-length
temporary file.
Strip all binaries explicitly, with list of them and loop, instead
of calling ${STRIP_CMD} with '*'.
(cherry picked from commit 59cb6bb257fe2d25041e9e0781c246ca6fcc2669)
---
devel/subversion/Makefile | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index bfcf3b3dcd98..5af347c3cf2e 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -85,6 +85,15 @@ WITH_REPOSITORY_CREATION= yes
MKREPOS_TARGET= _mkrepos
.endif
+
+BINS_TO_STRIP= svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnmucc \
+ svnrdump svnserve svnsync svnversion
+
+TOOLS_TO_STRIP= fsfs-access-map svn-mergeinfo-normalizer \
+ svn-populate-node-origins-index svnauthz \
+ svnauthz-validate svnconflict svndiff svndiff3 \
+ svndiff4 svnmover svnraisetreeconflict x509-parser
+
pre-everything::
@${ECHO_MSG} ""
.if defined(WITH_REPOSITORY_CREATION)
@@ -148,7 +157,9 @@ post-build-TOOLS-on:
@${MAKE} -C ${WRKSRC} tools ${MAKE_ARGS}
post-install: ${MKREPOS_TARGET}
- -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
+ for F in ${BINS_TO_STRIP} ; do \
+ ${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/$${F}" ; \
+ done
@${MKDIR} ${STAGEDIR}${DATADIR}
(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - )
@${MKDIR} ${STAGEDIR}${DOCSDIR}
@@ -162,7 +173,10 @@ post-install-SVNSERVE_WRAPPER-on:
post-install-TOOLS-on:
@${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS}
- -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
+ for F in ${TOOLS_TO_STRIP} ; do \
+ ${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/$${F}" ; \
+ done
+
# ===============================================================================
repository: _mkrepos