diff --git a/multibuild.eclass b/multibuild.eclass index 4dc9b19..2466226 100644 --- a/multibuild.eclass +++ b/multibuild.eclass @@ -274,20 +274,27 @@ multibuild_merge_root() { local cp_args=() - if cp -a --version &>/dev/null; then - cp_args+=( -a ) + # fix bug 447370 + if use userland_BSD; then + cd "${src}" + tar cf - . | tar xf - -C "${dest}" + ret=${?} else - cp_args+=( -P -R -p ) + if cp -a --version &>/dev/null; then + cp_args+=( -a ) + else + cp_args+=( -P -R -p ) + fi + + if cp --reflink=auto --version &>/dev/null; then + # enable reflinking if possible to make this faster + cp_args+=( --reflink=auto ) + fi + + cp "${cp_args[@]}" "${src}"/. "${dest}"/ + ret=${?} fi - if cp --reflink=auto --version &>/dev/null; then - # enable reflinking if possible to make this faster - cp_args+=( --reflink=auto ) - fi - - cp "${cp_args[@]}" "${src}"/. "${dest}"/ - ret=${?} - # Remove the lock. rm "${lockfile}" || die