Skip to content

Commit

Permalink
lang/ruby32: Fix orphaned .timestamp in b49bdb1
Browse files Browse the repository at this point in the history
When both CAPIDOCS and DOCS options are enabled, the following commands are executed:
1. post-install-CAPIDOCS-on: removed the installed .timestamp (in STAGEDIR).
2. post-install-DOCS-on: copied the generated .timestamp (in capi directory) to the STAGEDIR again.
Therefore, the installed .timestamp is orphaned.
To fix this, we remove both the generated and installed .timestamp in post-install-CAPIDOCS-on:.

PR:		267775
Reported by:	yasu
  • Loading branch information
sunpoet committed Dec 30, 2022
1 parent b59d2f8 commit 1626e9a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lang/ruby32/Makefile
Expand Up @@ -183,7 +183,7 @@ post-install:
.endif

post-install-CAPIDOCS-on:
${RM} ${STAGEDIR}${PREFIX}/share/doc/ruby${RUBY_SUFFIX}/capi/.timestamp
${RM} ${WRKSRC}/doc/capi/.timestamp ${STAGEDIR}${PREFIX}/share/doc/ruby${RUBY_SUFFIX}/capi/.timestamp
cd ${STAGEDIR}${PREFIX} && ${FIND} share/doc/ruby${RUBY_SUFFIX}/capi/ -type f >> ${TMPPLIST}

post-install-DEBUG-off:
Expand All @@ -204,7 +204,7 @@ post-install-DOCS-on:
${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
${STAGEDIR}${RUBY_DOCDIR}/${FILE:C|^([^/]+)/.*|\1|}/
.endfor
@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/ "! -name .timestamp")
@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/)
${INSTALL_DATA} ${WRKSRC}/COPYING* \
${WRKSRC}/ChangeLog \
${WRKSRC}/LEGAL \
Expand Down

0 comments on commit 1626e9a

Please sign in to comment.