FreeBSD Bugzilla – Attachment 238331 Details for
Bug 267775
lang/ruby{27,30,31,32}: Fix plist error when both CAPIDOCS and DOCS options are on.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch file for lang/ruby30
lang_ruby30.fix-plist.patch (text/plain), 1.56 KB, created by
Yasuhiro Kimura
on 2022-11-25 02:17:12 UTC
(
hide
)
Description:
Patch file for lang/ruby30
Filename:
MIME Type:
Creator:
Yasuhiro Kimura
Created:
2022-11-25 02:17:12 UTC
Size:
1.56 KB
patch
obsolete
>From 19300c8a2de15d2c3596bd9a723079de2cc6ba22 Mon Sep 17 00:00:00 2001 >From: Yasuhiro Kimura <yasu@FreeBSD.org> >Date: Fri, 25 Nov 2022 10:45:56 +0900 >Subject: [PATCH 2/4] lang/ruby30: 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: 93e3548c57a4 lang/ruby30: Simplify CAPIDOCS handling >--- > lang/ruby30/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/lang/ruby30/Makefile b/lang/ruby30/Makefile >index 5cd724866913..1580225a778a 100644 >--- a/lang/ruby30/Makefile >+++ b/lang/ruby30/Makefile >@@ -196,7 +196,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 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 267775
:
238082
|
238330
| 238331 |
238332