Attachment 176023 Details for Bug 213614 – v3

[patch] v3

optimize-copytree.diff (text/plain), 1.58 KB, created by Mathieu Arnold on 2016-10-21 14:30:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2016-10-21 14:30:22 UTC

Size: 1.58 KB

patch

obsolete

>diff --git Mk/bsd.port.mk Mk/bsd.port.mk
>index c5f7bf7..d0995eb 100644
>--- Mk/bsd.port.mk
>+++ Mk/bsd.port.mk
>@@ -2046,14 +2046,15 @@ MAKE_ENV+=	${INSTALL_MACROS}
> SCRIPTS_ENV+=	${INSTALL_MACROS}
> 
> # Macro for copying entire directory tree with correct permissions
>-COPYTREE_BIN=	${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
>-					2>&1) && \
>-					${FIND} -d $$0 $$2 -type d -exec chmod 755 $$1/{} \; && \
>-					${FIND} -d $$0 $$2 -type f -exec chmod ${BINMODE} $$1/{} \;' --
>-COPYTREE_SHARE=	${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
>-					2>&1) && \
>-					${FIND} -d $$0 $$2 -type d -exec chmod 755 $$1/{} \; && \
>-					${FIND} -d $$0 $$2 -type f -exec chmod ${SHAREMODE} $$1/{} \;' --
>+# In the -exec shell commands, we add add a . as the first argument, it would
>+# end up being $0 aka the script name, which is not part of $@, so we force it
>+# to be able to use $@ directly.
>+COPYTREE_BIN=	${SH} -c '(${FIND} -Ed $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null 2>&1) && \
>+					${FIND} -Ed $$0 $$2 $   -type d -exec ${SH} -c '\''cd '\''$$1'\'' && chmod 755 "$$@"'\'' -- . {} + \
>+										  -o -type f -exec ${SH} -c '\''cd '\''$$1'\'' && chmod ${BINMODE} "$$@"'\'' -- . {} + $' --
>+COPYTREE_SHARE=	${SH} -c '(${FIND} -Ed $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null 2>&1) && \
>+					${FIND} -Ed $$0 $$2 $   -type d -exec ${SH} -c '\''cd '\''$$1'\'' && chmod 755 "$$@"'\'' -- . {} + \
>+										  -o -type f -exec ${SH} -c '\''cd '\''$$1'\'' && chmod ${SHAREMODE} "$$@"'\'' -- . {} + $' --
> 
> # The user can override the NO_PACKAGE by specifying this from
> # the make command line

Actions: View | Diff

Attachments on bug 213614: 175935 | 175982 | 176023