Attachment 238332 Details for Bug 267775 – Patch file for lang/ruby31

[patch] Patch file for lang/ruby31

lang_ruby31.fix-plist.patch (text/plain), 1.56 KB, created by Yasuhiro Kimura on 2022-11-25 02:21:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2022-11-25 02:21:19 UTC

Size: 1.56 KB

patch

obsolete

>From 444b0b6f726ce40b470602a4478e32705f2043b3 Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Fri, 25 Nov 2022 10:47:17 +0900
>Subject: [PATCH 3/4] lang/ruby31: Fix plist error when both CAPIDOCS and DOCS
> options are on.
>
>When the both options are on, post-install-DOCS-on target is called
>after post-install-CAPIDOCS-on has completed. And in the former files
>under ${WRKSRC}/doc/ are copied to ${STAGEDIR}${RUBY_DOCDIR}. This
>means files under ${WRKSRC}/doc/capi are copied to
>${STAGEDIR}${RUBY_DOCDIR}/capi again. And of course
>${WRKSRC}/doc/capi/.timestamp is included in them. As a result, even
>though ${STAGEDIR}${RUBY_DOCDIR}/capi/.timestamp is removed in
>post-install-CAPIDOCS-on target, it is detected as orphaned file at
>check-plist phase. So fix it by adding 3rd argument to
>${COPYTREE_SHARE} command so .timestamp is excluded from files to be
>copied.
>
>Fixes:	6021649ff0ce lang/ruby31: Simplify CAPIDOCS handling
>---
> lang/ruby31/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/lang/ruby31/Makefile b/lang/ruby31/Makefile
>index 295f3bd3a650..fa350ff2e52a 100644
>--- a/lang/ruby31/Makefile
>+++ b/lang/ruby31/Makefile
>@@ -201,7 +201,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}/)
>+	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/ "! -name .timestamp")
> 	${INSTALL_DATA} ${WRKSRC}/COPYING*	\
> 			${WRKSRC}/ChangeLog	\
> 			${WRKSRC}/LEGAL		\
>-- 
>2.38.1
>

Actions: View | Diff

Attachments on bug 267775: 238082 | 238330 | 238331 | 238332