Skip to content

Commit

Permalink
devel/subversion-lts: Make all binaries stripping explicit.
Browse files Browse the repository at this point in the history
  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 '*'.
  • Loading branch information
blacklion committed Apr 13, 2022
1 parent 56a5e56 commit 655a704
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions devel/subversion-lts/Makefile
Expand Up @@ -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
Expand All @@ -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}
Expand All @@ -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
Expand Down

0 comments on commit 655a704

Please sign in to comment.