diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-27 22:07:36 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-27 22:07:36 +0000 |
| commit | 81b8af2c238a6e04a9b5242df0b262faa5f812e2 (patch) | |
| tree | f79a218099afb954c8bfbfba1020adce1ca8d605 | |
| parent | Bump. (diff) | |
| download | historical-81b8af2c238a6e04a9b5242df0b262faa5f812e2.tar.gz historical-81b8af2c238a6e04a9b5242df0b262faa5f812e2.tar.bz2 historical-81b8af2c238a6e04a9b5242df0b262faa5f812e2.zip | |
Use tar instead of cpio since not all stage1s have cpio.
| -rw-r--r-- | eclass/multilib.eclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index 364edd83c035..137fab700ee9 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.14 2005/01/18 04:56:03 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.15 2005/01/27 22:07:36 eradicator Exp $ # # Author: Jeremy Huddleston <eradicator@gentoo.org> # @@ -13,9 +13,10 @@ INHERITED="$INHERITED $ECLASS" DESCRIPTION="Based on the ${ECLASS} eclass" # has_multilib_profile: -# Return true if the current profile is a multilib profile. You might -# want to use this like 'use multilib || has_multilib_profile' until -# all profiles utilizing the 'multilib' use flag are removed from portage +# Return true if the current profile is a multilib profile and lists more than +# one abi in ${MULTILIB_ABIS}. You might want to use this like +# 'use multilib || has_multilib_profile' until all profiles utilizing the +# 'multilib' use flag are removed from portage # is_final_abi: # Return true if ${ABI} is the final abi to be installed (and thus we are @@ -84,9 +85,8 @@ DESCRIPTION="Based on the ${ECLASS} eclass" ### END DOCUMENTATION ### # has_multilib_profile() -# Return true if has_multilib_profile() { - [ -n "${MULTILIB_ABIS}" ] + [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ] } # This function simply returns the desired lib directory. With portage @@ -323,7 +323,7 @@ prep_ml_includes() { if is_final_abi; then base=${T}/gentoo-multilib pushd ${base} - find . | cpio -pmd --no-preserve-owner ${D} + find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D} popd for dir in ${dirs}; do |