git: a38010434ba7 - 2022Q2 - devel/subversion-lts: Make all binaries stripping explicit.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 22 Apr 2022 09:43:07 UTC
The branch 2022Q2 has been updated by lev: URL: https://cgit.FreeBSD.org/ports/commit/?id=a38010434ba7bd4196e8dea23d14dfddd804593a commit a38010434ba7bd4196e8dea23d14dfddd804593a Author: Lev A. Serebryakov <lev@FreeBSD.org> AuthorDate: 2022-04-13 18:25:49 +0000 Commit: Lev A. Serebryakov <lev@FreeBSD.org> CommitDate: 2022-04-22 09:42:34 +0000 devel/subversion-lts: 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 655a704986632b3404272af46d8389274f5c25b8) --- devel/subversion-lts/Makefile | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/devel/subversion-lts/Makefile b/devel/subversion-lts/Makefile index 67031041bdb9..4e9dbc9b1535 100644 --- a/devel/subversion-lts/Makefile +++ b/devel/subversion-lts/Makefile @@ -132,6 +132,14 @@ LIBS+= ${LIBS_SQLITE3} LIBS+= -lc++ -lm .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 + post-configure: # Enable GNOME Keyring / KWallet support in main code, as it is harmless @${REINPLACE_CMD} -E 's%.*#undef SVN_HAVE_(GNOME_KEYRING|KWALLET).*%#define SVN_HAVE_\1 1%' ${WRKSRC}/subversion/svn_private_config.h @@ -149,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} @@ -163,7 +173,9 @@ 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